mirror of
https://git.launchpad.net/ubuntu-dev-tools
synced 2025-05-10 08:21:29 +00:00
ubuntutools.archive: Improve error handling around rmadison calls
(LP: #1010951)
This commit is contained in:
parent
fa83ac6b0b
commit
4056e98a43
2
debian/changelog
vendored
2
debian/changelog
vendored
@ -26,6 +26,8 @@ ubuntu-dev-tools (0.143) UNRELEASED; urgency=low
|
|||||||
* backportpackage.1: Document --key and --dont-sign (LP: #1007564)
|
* backportpackage.1: Document --key and --dont-sign (LP: #1007564)
|
||||||
* seeded-in-ubuntu: Catch errors in parsing data, and don't keep unreadable
|
* seeded-in-ubuntu: Catch errors in parsing data, and don't keep unreadable
|
||||||
data cached (LP: #1008783)
|
data cached (LP: #1008783)
|
||||||
|
* ubuntutools.archive: Improve error handling around rmadison calls
|
||||||
|
(LP: #1010951)
|
||||||
|
|
||||||
-- Mathieu Trudel-Lapierre <mathieu-tl@ubuntu.com> Wed, 06 Jun 2012 09:53:24 -0400
|
-- Mathieu Trudel-Lapierre <mathieu-tl@ubuntu.com> Wed, 06 Jun 2012 09:53:24 -0400
|
||||||
|
|
||||||
|
@ -600,13 +600,12 @@ def rmadison(url, package, suite=None, arch=None):
|
|||||||
process = subprocess.Popen(cmd, stdout=subprocess.PIPE,
|
process = subprocess.Popen(cmd, stdout=subprocess.PIPE,
|
||||||
stderr=subprocess.PIPE, close_fds=True)
|
stderr=subprocess.PIPE, close_fds=True)
|
||||||
output, error_output = process.communicate()
|
output, error_output = process.communicate()
|
||||||
try:
|
if process.wait() != 0:
|
||||||
assert process.wait() == 0
|
|
||||||
except AssertionError:
|
|
||||||
if error_output:
|
if error_output:
|
||||||
Logger.error('rmadison failed with: %s', error_output)
|
Logger.error('rmadison failed with: %s', error_output)
|
||||||
sys.exit(1)
|
else:
|
||||||
raise
|
Logger.error('rmadison failed')
|
||||||
|
sys.exit(1)
|
||||||
|
|
||||||
# rmadison uses some shorthand
|
# rmadison uses some shorthand
|
||||||
if suite:
|
if suite:
|
||||||
|
Loading…
x
Reference in New Issue
Block a user