diff options
| author | Guido Günther <agx@sigxcpu.org> | 2014-05-22 13:00:15 +0200 |
|---|---|---|
| committer | Guido Günther <agx@sigxcpu.org> | 2014-05-22 16:27:32 +0200 |
| commit | a050942804729e4e96352a5bdd34e6d27fb4f24b (patch) | |
| tree | 14b9f82d92be01d4c98e069b6e90e07668df8541 | |
| parent | b2549fac19f2d666552291a4fcf2020ca0570834 (diff) | |
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
| -rw-r--r-- | gbp/command_wrappers.py | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/gbp/command_wrappers.py b/gbp/command_wrappers.py index 8a131e11..b8bd21f7 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)) |