From a050942804729e4e96352a5bdd34e6d27fb4f24b Mon Sep 17 00:00:00 2001 From: Guido Günther Date: Thu, 22 May 2014 13:00:15 +0200 Subject: Improve error reporting on failed commands Make it more clear if the command exited with non zero exit status. Also don't report the command line twice. Closes: #748248 --- gbp/command_wrappers.py | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'gbp') 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)) -- cgit v1.2.3