diff options
| author | Colin Watson <cjwatson@canonical.com> | 2012-01-31 11:19:26 +0000 |
|---|---|---|
| committer | Colin Watson <cjwatson@canonical.com> | 2012-01-31 11:19:26 +0000 |
| commit | 8549f47633a0869cec4fad8f908b170c110b18bc (patch) | |
| tree | 13fa67fc6f8d3a21f0c87f7ef83afe387f64cd43 | |
| parent | f857680f3d0ae43f1d1ab5e07e505066e244e31d (diff) | |
Fix IndexCopy::CopyPackages and TranslationsCopy::CopyTranslations to
handle compressed files again (LP: #924182).
| -rw-r--r-- | apt-pkg/indexcopy.cc | 4 | ||||
| -rw-r--r-- | debian/changelog | 7 |
2 files changed, 9 insertions, 2 deletions
diff --git a/apt-pkg/indexcopy.cc b/apt-pkg/indexcopy.cc index 3747e3570..e29e2819c 100644 --- 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 df9b515dd..6f6f03b92 100644 --- 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 ] |