Fix IndexCopy::CopyPackages and TranslationsCopy::CopyTranslations to

handle compressed files again (LP: #924182, closes: #658096)

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
       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);
       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
       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);
       off_t const FileSize = Pkg.Size();
 
       pkgTagFile Parser(&Pkg);

diff --git a/debian/changelog b/debian/changelog
index 122c2ce36b965f16537fdc9f397596c240fdcb96..361c38ad184993180b3fed6134d5a3b43e4d8bed 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -27,6 +27,8 @@ apt (0.8.16~exp13) UNRELEASED; urgency=low
       of them in a single iteration (Closes: #657695, LP: #922485)
     - use a signed int instead of short for score calculation as upgrades
       become so big now that it can overflow (Closes: #657732, LP: #917173)
       of them in a single iteration (Closes: #657695, LP: #922485)
     - use a signed int instead of short for score calculation as upgrades
       become so big now that it can overflow (Closes: #657732, LP: #917173)

+  * Fix IndexCopy::CopyPackages and TranslationsCopy::CopyTranslations to
+    handle compressed files again (LP: #924182, closes: #658096)

   
   [ Michael Vogt ]
   * apt-pkg/deb/dpkgpm.cc:
   
   [ Michael Vogt ]
   * apt-pkg/deb/dpkgpm.cc: