ubuntutools.archive: Display any errors rmadison emits, rather than

guessing at the cause. (LP: #788447)
This commit is contained in:
Stefano Rivera 2011-05-30 10:21:12 +02:00
parent c13550bcb6
commit 1c248875b4
2 changed files with 10 additions and 2 deletions

5
debian/changelog vendored
View File

@ -1,9 +1,14 @@
ubuntu-dev-tools (0.125) UNRELEASED; urgency=low
[ Benjamin Drung ]
* backportpackage: Use --force-bad-version instead of --allow-lower-version
(which requires a parameter) for debchange.
* Adjust EOL date of Ubuntu 9.10 "Karmic Koala".
[ Stefano Rivera ]
* ubuntutools.archive: Display any errors rmadison emits, rather than
guessing at the cause. (LP: #788447)
-- Benjamin Drung <bdrung@debian.org> Sat, 28 May 2011 19:43:10 +0200
ubuntu-dev-tools (0.124) unstable; urgency=low

View File

@ -519,11 +519,14 @@ def rmadison(url, package, suite=None, arch=None):
cmd.append(package)
process = subprocess.Popen(cmd, stdout=subprocess.PIPE,
stderr=subprocess.PIPE, close_fds=True)
output = process.communicate()[0]
output, error_output = process.communicate()
try:
assert process.wait() == 0
except AssertionError:
print "Request failed: install the liburi-perl package and try again."
if error_output:
Logger.error('rmadison failed with: %s', error_output)
sys.exit(1)
raise
# rmadison uses some shorthand
if suite: