* apt-pkg/contrib/fileutl.h:

  - fix compat with FileFd::OpenDescriptor() in ReadOnlyGzip mode

diff --git a/apt-pkg/contrib/fileutl.h b/apt-pkg/contrib/fileutl.h
index 3814cfe44cbe99ef00c0a92781fe998e8b0d8a26..8a50251421625ba030b76f34201fa71905011fe8 100644 (file)
--- 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) {
    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();
    };
    bool Close();
    bool Sync();

diff --git a/debian/changelog b/debian/changelog
index 122c2ce36b965f16537fdc9f397596c240fdcb96..360fcf45336e1aaac8d3bd623c4d21d9b26bb5db 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -32,6 +32,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/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
 
 
  -- David Kalnischkies <kalnischkies@gmail.com>  Mon, 30 Jan 2012 19:17:09 +0100