summaryrefslogtreecommitdiff
path: root/apt-pkg/acquire-item.cc
diff options
context:
space:
mode:
authorMichael Vogt <mvo@debian.org>2008-11-05 13:20:25 +0100
committerMichael Vogt <mvo@debian.org>2008-11-05 13:20:25 +0100
commita530607f8ac4936402831d854f171fc8dc89ef4f (patch)
tree07c3d3ce6781af2b36837aa3ced198e47e83daca /apt-pkg/acquire-item.cc
parent81c1659e78d9cae0ecdee331f16e86564adccf5d (diff)
parent1c8ab7200ec4527cd38d0b4d0ef847452f011915 (diff)
* debian/rules:
- Fixed lintian warnings "debian/rules ignores make errors". * debian/control: - Substituted outdated "Source-Version" fields with "binary:Version". - Added 'python-apt' to Suggests, as apt-mark need it for work. - Drop Debian revision from 'doc-base' build dependency, this fixes appropriate lintian warning. * debian/libapt-pkg-doc.doc-base.*: - Changed section: from old 'Devel' to 'Debian'. This fixes appropriate lintian warnings. * debian/{postrm,prerm,preinst}: - Added 'set -e', fixes lintian warnings 'maintainer-script-ignores-error'. * dselect/makefile: - Removed unneeded 'LOCAL' entry. This allows cleaning rule to run smoothly. * share/lintian-overrides: - Added with override of 'apt must depend on python'. Script 'apt-mark' needs apt-python for working and checks this on fly. We don't want python in most cases. * cmdline/apt-key: - Added 'unset GREP_OPTIONS' to the script. This prevents 'apt-key update' failure when GREP_OPTIONS contains options that modify grep output. (Closes: #428752) * apt-pkg/acquire-item.cc: - fix a merge mistake that prevents the fallback to the uncompressed 'Packages' to work correctly (closes: #409284) * apt-pkg/acquire-item.cc: - Added fallback to uncompressed 'Packages' if neither 'bz2' nor 'gz' available. (Closes: #409284) * apt-pkg/algorithm.cc: - Strip username and password from source URL in error message. (Closes: #425150) * fix various -Wall warnings
Diffstat (limited to 'apt-pkg/acquire-item.cc')
-rw-r--r--apt-pkg/acquire-item.cc4
1 files changed, 4 insertions, 0 deletions
diff --git a/apt-pkg/acquire-item.cc b/apt-pkg/acquire-item.cc
index ae8ff2205..09ea5da02 100644
--- a/apt-pkg/acquire-item.cc
+++ b/apt-pkg/acquire-item.cc
@@ -718,6 +718,10 @@ void pkgAcqIndex::Done(string Message,unsigned long Size,string Hash,
else if(compExt == "gz")
decompProg = "gzip";
// flExtensions returns the full name if no extension is found
+ // this is why we have this complicated compare operation here
+ // FIMXE: add a new flJustExtension() that return "" if no
+ // extension is found and use that above so that it can
+ // be tested against ""
else if(compExt == flNotDir(URI(Desc.URI).Path))
decompProg = "copy";
else {