diff options
| author | Michael Vogt <michael.vogt@ubuntu.com> | 2012-02-03 12:14:39 +0100 |
|---|---|---|
| committer | Michael Vogt <michael.vogt@ubuntu.com> | 2012-02-03 12:14:39 +0100 |
| commit | f2ea4c45421bfe73e70b8210e327bea5018811a7 (patch) | |
| tree | f169e2919b202df770d0303ffd650b246bec9d85 | |
| parent | 144353a9ef433d4ef6c1eda06097ed572de177da (diff) | |
| parent | 49d152d074a7602125f14d8726b952037aec15f0 (diff) | |
* apt-pkg/contrib/fileutl.h:
- fix compat with FileFd::OpenDescriptor() in ReadOnlyGzip mode
| -rw-r--r-- | apt-pkg/contrib/fileutl.h | 5 | ||||
| -rw-r--r-- | debian/changelog | 2 |
2 files changed, 6 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 361c38ad1..db2085a6a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -34,6 +34,8 @@ apt (0.8.16~exp13) UNRELEASED; urgency=low * apt-pkg/deb/dpkgpm.cc: - fix crash when a package is in removed but residual config state (LP: #923807) + * apt-pkg/contrib/fileutl.h: + - fix compat with FileFd::OpenDescriptor() in ReadOnlyGzip mode -- David Kalnischkies <kalnischkies@gmail.com> Mon, 30 Jan 2012 19:17:09 +0100 |