Fix IndexCopy::CopyPackages and TranslationsCopy::CopyTranslations to

handle compressed files again (LP: #924182).

diff --git a/apt-pkg/indexcopy.cc b/apt-pkg/indexcopy.cc
index 3747e357003a1cd0e8ae05f468a833bf745bd241..e29e2819cb5eb5a806da8a757624999cc2534a06 100644 (file)
--- a/apt-pkg/indexcopy.cc
+++ b/apt-pkg/indexcopy.cc
@@ -85,7 +85,7 @@ bool IndexCopy::CopyPackages(string CDROM,string Name,vector<string> &List,
       string OrigPath = string(*I,CDROM.length());
       
       // Open the package file
-      FileFd Pkg(*I + GetFileName(), FileFd::ReadOnly, FileFd::Extension);
+      FileFd Pkg(*I + GetFileName(), FileFd::ReadOnly, FileFd::Auto);
       off_t const FileSize = Pkg.Size();
 
       pkgTagFile Parser(&Pkg);
@@ -797,7 +797,7 @@ bool TranslationsCopy::CopyTranslations(string CDROM,string Name,   /*{{{*/
       string OrigPath = string(*I,CDROM.length());
 
       // Open the package file
-      FileFd Pkg(*I, FileFd::ReadOnly, FileFd::Extension);
+      FileFd Pkg(*I, FileFd::ReadOnly, FileFd::Auto);
       off_t const FileSize = Pkg.Size();
 
       pkgTagFile Parser(&Pkg);

diff --git a/debian/changelog b/debian/changelog
index df9b515ddc5c521c96dec4238fed5a09c77e051c..6f6f03b92ff9cccbb5828a7f6690c03684a54531 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+apt (0.8.16~exp12ubuntu3) UNRELEASED; urgency=low
+
+  * Fix IndexCopy::CopyPackages and TranslationsCopy::CopyTranslations to
+    handle compressed files again (LP: #924182).
+
+ -- Colin Watson <cjwatson@ubuntu.com>  Tue, 31 Jan 2012 10:30:06 +0000
+
 apt (0.8.16~exp12ubuntu2) precise; urgency=low
 
   [ David Kalnischkies ]