summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Vogt <michael.vogt@ubuntu.com>2012-01-31 17:50:58 +0100
committerMichael Vogt <michael.vogt@ubuntu.com>2012-01-31 17:50:58 +0100
commit144353a9ef433d4ef6c1eda06097ed572de177da (patch)
tree70d4aba96a25211091567e867ad0daca01895802
parent600268e36cdefa39c01d9a7be741d152d317c880 (diff)
Fix IndexCopy::CopyPackages and TranslationsCopy::CopyTranslations to
handle compressed files again (LP: #924182, closes: #658096)
-rw-r--r--apt-pkg/indexcopy.cc4
-rw-r--r--debian/changelog2
2 files changed, 4 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 122c2ce36..361c38ad1 100644
--- 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)
+ * Fix IndexCopy::CopyPackages and TranslationsCopy::CopyTranslations to
+ handle compressed files again (LP: #924182, closes: #658096)
[ Michael Vogt ]
* apt-pkg/deb/dpkgpm.cc: