浏览代码

* apt-pkg/contrib/fileutl.h:
- fix compat with FileFd::OpenDescriptor() in ReadOnlyGzip mode

Michael Vogt 14 年之前
父节点
当前提交
49d152d074
共有 2 个文件被更改,包括 6 次插入1 次删除
  1. 4 1
      apt-pkg/contrib/fileutl.h
  2. 2 0
      debian/changelog

+ 4 - 1
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, CompressMode Compress, bool AutoClose=false);
    bool OpenDescriptor(int Fd, unsigned int const Mode, APT::Configuration::Compressor const &compressor, 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) {
    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 Close();
    bool Sync();
    bool Sync();

+ 2 - 0
debian/changelog

@@ -32,6 +32,8 @@ apt (0.8.16~exp13) UNRELEASED; urgency=low
   * apt-pkg/deb/dpkgpm.cc:
   * apt-pkg/deb/dpkgpm.cc:
     - fix crash when a package is in removed but residual config state
     - fix crash when a package is in removed but residual config state
       (LP: #923807)
       (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