diff options
| author | Julian Andres Klode <jak@debian.org> | 2009-07-30 14:36:35 +0200 |
|---|---|---|
| committer | Julian Andres Klode <jak@debian.org> | 2009-07-30 14:36:35 +0200 |
| commit | 2b64e774ba825789caea80d9424faf1ac3be19d9 (patch) | |
| tree | d9020c831e98ddba677ee7d3626c321bb4c92389 | |
| parent | eadd9977838ee990a06d5f5702313f81c824d51d (diff) | |
| download | python-apt-2b64e774ba825789caea80d9424faf1ac3be19d9.tar.gz | |
apt/progress.py: Extract the package name from the status message
(Closes: #532660)
| -rw-r--r-- | apt/progress/__init__.py | 5 | ||||
| -rw-r--r-- | debian/changelog | 4 |
2 files changed, 7 insertions, 2 deletions
diff --git a/apt/progress/__init__.py b/apt/progress/__init__.py index b582ad22..b9288c2c 100644 --- a/apt/progress/__init__.py +++ b/apt/progress/__init__.py @@ -344,7 +344,7 @@ class DpkgInstallProgress(InstallProgress): if pid == 0: # child res = os.system("/usr/bin/dpkg --status-fd %s -i %s" % \ - (self.writefd, self.debfile)) + (self.writefd, debfile)) os._exit(os.WEXITSTATUS(res)) self.child_pid = pid res = self.waitChild() @@ -370,10 +370,11 @@ class DpkgInstallProgress(InstallProgress): print "got garbage from dpkg: '%s'" % self.read self.read = "" break + pkg_name = statusl[1].strip() status = statusl[2].strip() #print status if status == "error": - self.error(self.debname, status) + self.error(pkg_name, status) elif status == "conffile-prompt": # we get a string like this: # 'current-conffile' 'new-conffile' useredited distedited diff --git a/debian/changelog b/debian/changelog index e95a3fe2..83422b00 100644 --- a/debian/changelog +++ b/debian/changelog @@ -15,6 +15,10 @@ python-apt (0.7.11.2) unstable; urgency=low * debian/python-apt.doc-base: register the documentation with the doc-base system (Closes: #525134) + [ Sebastian Heinlein ] + * apt/progress.py: Extract the package name from the status message + (Closes: #532660) + -- Julian Andres Klode <jak@debian.org> Thu, 30 Jul 2009 14:08:30 +0200 python-apt (0.7.11.1) unstable; urgency=low |