diff options
| author | Michael Vogt <michael.vogt@ubuntu.com> | 2012-06-13 09:29:08 +0200 |
|---|---|---|
| committer | Michael Vogt <michael.vogt@ubuntu.com> | 2012-06-13 09:29:08 +0200 |
| commit | 122953263c96cd43b0d8a15fa714cd4d80be5ec9 (patch) | |
| tree | 5c224d903cdaa3cf36ed95db1822f8eb1c3a2c4a | |
| parent | bcef41df6bdefdd95e0b7cab0428b4655accf9fa (diff) | |
| parent | 5cdd74bc9e017f8802f96d915131c8cf525d4146 (diff) | |
| download | python-apt-122953263c96cd43b0d8a15fa714cd4d80be5ec9.tar.gz | |
merged lp:~ev/python-apt/drop-leaked-fds-fix
| -rw-r--r-- | apt/progress/base.py | 5 | ||||
| -rw-r--r-- | debian/changelog | 3 |
2 files changed, 1 insertions, 7 deletions
diff --git a/apt/progress/base.py b/apt/progress/base.py index 88b1ad21..ab57dd82 100644 --- a/apt/progress/base.py +++ b/apt/progress/base.py @@ -142,14 +142,11 @@ class InstallProgress(object): def __init__(self): (self.statusfd, self.writefd) = os.pipe() + # These will leak fds, but fixing this safely requires API changes. self.write_stream = os.fdopen(self.writefd, "w") 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 73cc14a3..1ecddacf 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,9 +9,6 @@ python-apt (0.8.5) UNRELEASED; urgency=low * data/templates/Ubuntu.info.in: - add quantal - [ Evan Dandrea ] - * Don't leak file descriptors. - [ Steve Langasek ] * utils/get_ubuntu_mirrors_from_lp.py: move this script to python3 * pre-build.sh: call dpkg-checkbuilddeps with the list of our |