diff options
| -rw-r--r-- | apt/progress/base.py | 12 | ||||
| -rw-r--r-- | debian/changelog | 2 |
2 files changed, 7 insertions, 7 deletions
diff --git a/apt/progress/base.py b/apt/progress/base.py index ccf618f9..88fee206 100644 --- a/apt/progress/base.py +++ b/apt/progress/base.py @@ -140,8 +140,8 @@ class InstallProgress(object): def __init__(self): (self.statusfd, self.writefd) = os.pipe() - self.write_pipe = os.fdopen(self.writefd, "w") - self.status_pipe = os.fdopen(self.statusfd, "r") + 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 start_update(self): @@ -190,10 +190,10 @@ class InstallProgress(object): # and the execution continues in the # parent code leading to very confusing bugs try: - os._exit(obj.do_install(self.write_pipe.fileno())) + os._exit(obj.do_install(self.write_stream.fileno())) except AttributeError: os._exit(os.spawnlp(os.P_WAIT, "dpkg", "dpkg", "--status-fd", - str(self.write_pipe.fileno()), "-i", obj)) + str(self.write_stream.fileno()), "-i", obj)) except Exception: os._exit(apt_pkg.PackageManager.RESULT_FAILED) @@ -208,7 +208,7 @@ class InstallProgress(object): def update_interface(self): """Update the interface.""" try: - line = self.status_pipe.readline() + line = self.status_stream.readline() except IOError, err: # resource temporarly unavailable is ignored if err.errno != errno.EAGAIN and err.errno != errno.EWOULDBLOCK: @@ -263,7 +263,7 @@ class InstallProgress(object): (pid, res) = (0, 0) while True: try: - select.select([self.status_pipe], [], [], self.select_timeout) + select.select([self.status_stream], [], [], self.select_timeout) except select.error, (errno_, errstr): if errno_ != errno.EINTR: raise diff --git a/debian/changelog b/debian/changelog index 012a6e1d..8c488e0b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -29,7 +29,7 @@ python-apt (0.7.93.2) UNRELEASED; urgency=low compatibility with older code * apt/progress/base.py: - restore "self.statusfd, self.writefd" type, provide additional - self.status_pipe and self.write_pipe file like objects + self.status_stream and self.write_stream file like objects -- Julian Andres Klode <jak@debian.org> Sun, 07 Feb 2010 19:58:40 +0100 |