From: Rob Browning Date: Sun, 12 Jan 2020 18:03:23 +0000 (-0600) Subject: helpers.exo: only report non-empty stderr X-Git-Tag: 0.31~130 X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?p=bup.git;a=commitdiff_plain;h=b26eaeb08c3c497e9b65122f676bb5f7ef495d21 helpers.exo: only report non-empty stderr Signed-off-by: Rob Browning Tested-by: Rob Browning --- diff --git a/lib/bup/helpers.py b/lib/bup/helpers.py index 38fbc24..a5c5165 100644 --- a/lib/bup/helpers.py +++ b/lib/bup/helpers.py @@ -327,8 +327,9 @@ def exo(cmd, preexec_fn=preexec_fn) out, err = p.communicate(input) if check and p.returncode != 0: - raise Exception('subprocess %r failed with status %d, stderr: %r' - % (b' '.join(map(quote, cmd)), p.returncode, err)) + raise Exception('subprocess %r failed with status %d%s' + % (b' '.join(map(quote, cmd)), p.returncode, + ', stderr: %r' % err if err else '')) return out, err, p def readpipe(argv, preexec_fn=None, shell=False):