aboutsummaryrefslogtreecommitdiff
path: root/gbp/command_wrappers.py
diff options
context:
space:
mode:
authorGuido Günther <agx@sigxcpu.org>2015-03-17 09:16:03 +0100
committerGuido Günther <agx@sigxcpu.org>2015-03-17 09:16:03 +0100
commit6f51faef5a021488a159c62473c5f17d4bead1ee (patch)
tree02dd28ff140ae846ba7b5cb6abe3d96ef2728b14 /gbp/command_wrappers.py
parent2271202a44b461a9c61ccd1815822483b64bc4d3 (diff)
parent4c9d692d52fd3fdf72733b07a5c4d5da3a128ca8 (diff)
Merge tag 'debian/0.6.22' into bpo/wheezy
git-buildpackage Debian release 0.6.22
Diffstat (limited to 'gbp/command_wrappers.py')
-rw-r--r--gbp/command_wrappers.py10
1 files changed, 4 insertions, 6 deletions
diff --git a/gbp/command_wrappers.py b/gbp/command_wrappers.py
index 8a131e1..b8bd21f 100644
--- a/gbp/command_wrappers.py
+++ b/gbp/command_wrappers.py
@@ -40,8 +40,7 @@ class Command(object):
capture_stderr=False):
self.cmd = cmd
self.args = args
- self.run_error = "Couldn't run '%s'" % (" ".join([self.cmd] +
- self.args))
+ self.run_error = "'%s' failed" % (" ".join([self.cmd] + self.args))
self.shell = shell
self.retcode = 1
self.stderr = ''
@@ -91,12 +90,11 @@ class Command(object):
try:
retcode = self.__call(args)
if retcode < 0:
- err_detail = "%s was terminated by signal %d" % (self.cmd,
- -retcode)
+ err_detail = "it was terminated by signal %d" % -retcode
elif retcode > 0:
- err_detail = "%s returned %d" % (self.cmd, retcode)
+ err_detail = "it exited with %d" % retcode
except OSError as err:
- err_detail = "Execution failed: %s" % err
+ err_detail = "execution failed: %s" % err
retcode = 1
if retcode and not quiet:
log.err("%s: %s" % (self.run_error, err_detail))