Przeglądaj źródła

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

Michael Vogt 14 lat temu
rodzic
commit
144353a9ef
2 zmienionych plików z 4 dodań i 2 usunięć
  1. 2 2
      apt-pkg/indexcopy.cc
  2. 2 0
      debian/changelog

+ 2 - 2
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);

+ 2 - 0
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)
+  * Fix IndexCopy::CopyPackages and TranslationsCopy::CopyTranslations to
+    handle compressed files again (LP: #924182, closes: #658096)
   
   [ Michael Vogt ]
   * apt-pkg/deb/dpkgpm.cc: