* apt-pkg/contrib/fileutils.h:

  - fix segfault from python-apt testsuite

diff --git a/apt-pkg/contrib/fileutl.h b/apt-pkg/contrib/fileutl.h
index 147535df1b6f7f1f3ada211d0426df3c2ed3349a..3814cfe44cbe99ef00c0a92781fe998e8b0d8a26 100644 (file)
--- a/apt-pkg/contrib/fileutl.h
+++ b/apt-pkg/contrib/fileutl.h
@@ -115,7 +115,7 @@ class FileFd
    
    // Simple manipulators
    inline int Fd() {return iFd;};
-   inline void Fd(int fd) {iFd = fd;};
+   inline void Fd(int fd) { OpenDescriptor(fd, ReadWrite);};
    __deprecated gzFile gzFd();
 
    inline bool IsOpen() {return iFd >= 0;};

diff --git a/debian/changelog b/debian/changelog
index 5eb4e593fd6233acfb3a044ff6b0d9cfb4f09638..2e8bcfb13030e872b8f605e6b5767f182f116a50 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,10 @@ apt (0.8.16~exp10) UNRELEASED; urgency=low
     - check if dpkg supports multiarch with --assert-multi-arch
       and if it does be always explicit about the architecture
 
+  [ Michael Vogt ]
+  * apt-pkg/contrib/fileutils.h:
+    - fix segfault from python-apt testsuite
+
  -- David Kalnischkies <kalnischkies@gmail.com>  Fri, 13 Jan 2012 17:29:07 +0100
 
 apt (0.8.16~exp9) experimental; urgency=low