summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Vogt <michael.vogt@ubuntu.com>2012-06-12 09:00:23 +0200
committerMichael Vogt <michael.vogt@ubuntu.com>2012-06-12 09:00:23 +0200
commit32eb1cd06404fdcb0d4507ea77e1685a19d185c1 (patch)
tree1d5a263047d0e02c30a1582c45af9b27ae5835b9
parent9ff1b964d3b4ccb041eddfda9ad930db736769a1 (diff)
downloadpython-apt-32eb1cd06404fdcb0d4507ea77e1685a19d185c1.tar.gz
merge fix from lp:~ev/python-apt/dont-leak-fds, many thanks
-rw-r--r--apt/progress/base.py4
-rw-r--r--debian/changelog6
2 files changed, 10 insertions, 0 deletions
diff --git a/apt/progress/base.py b/apt/progress/base.py
index 4943978c..88b1ad21 100644
--- a/apt/progress/base.py
+++ b/apt/progress/base.py
@@ -146,6 +146,10 @@ class InstallProgress(object):
self.status_stream = os.fdopen(self.statusfd, "r")
fcntl.fcntl(self.statusfd, fcntl.F_SETFL, os.O_NONBLOCK)
+ def __del__(self):
+ self.write_stream.close()
+ self.status_stream.close()
+
def start_update(self):
"""(Abstract) Start update."""
diff --git a/debian/changelog b/debian/changelog
index 63f72fa5..8d8be6a6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -43,6 +43,12 @@ python-apt (0.8.4~exp1) experimental; urgency=low
-- Michael Vogt <mvo@debian.org> Tue, 24 Jan 2012 14:02:46 +0100
+python-apt (0.8.3ubuntu9) UNRELEASED; urgency=low
+
+ * Don't leak file descriptors.
+
+ -- Evan Dandrea <ev@ubuntu.com> Mon, 11 Jun 2012 17:00:37 +0100
+
python-apt (0.8.3) unstable; urgency=low
[ Alexey Feldgendler ]