summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--apt-pkg/contrib/fileutl.h5
-rw-r--r--debian/changelog7
2 files changed, 11 insertions, 1 deletions
diff --git a/apt-pkg/contrib/fileutl.h b/apt-pkg/contrib/fileutl.h
index 3814cfe44..8a5025142 100644
--- a/apt-pkg/contrib/fileutl.h
+++ b/apt-pkg/contrib/fileutl.h
@@ -108,7 +108,10 @@ class FileFd
bool OpenDescriptor(int Fd, unsigned int const Mode, CompressMode Compress, bool AutoClose=false);
bool OpenDescriptor(int Fd, unsigned int const Mode, APT::Configuration::Compressor const &compressor, bool AutoClose=false);
inline bool OpenDescriptor(int Fd, unsigned int const Mode, bool AutoClose=false) {
- return OpenDescriptor(Fd, Mode, None, AutoClose);
+ if (Mode == ReadOnlyGzip)
+ return OpenDescriptor(Fd, Mode, Gzip, AutoClose);
+ else
+ return OpenDescriptor(Fd, Mode, None, AutoClose);
};
bool Close();
bool Sync();
diff --git a/debian/changelog b/debian/changelog
index 24523cf36..2579b91ce 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+apt (0.8.16~exp12ubuntu4) UNRELEASED; urgency=low
+
+ * apt-pkg/contrib/fileutl.h:
+ - fix compat with FileFd::OpenDescriptor() in ReadOnlyGzip mode
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Fri, 03 Feb 2012 11:57:57 +0100
+
apt (0.8.16~exp12ubuntu3) precise; urgency=low
* Fix IndexCopy::CopyPackages and TranslationsCopy::CopyTranslations to