helpers.exo: only report non-empty stderr

Signed-off-by: Rob Browning <rlb@defaultvalue.org>
Tested-by: Rob Browning <rlb@defaultvalue.org>

diff --git a/lib/bup/helpers.py b/lib/bup/helpers.py
index 38fbc244c1d79e3ee3ee0dee08d60a7200e3187f..a5c5165bc5d92bd3274e755886a1f055c46d87a2 100644 (file)
--- 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:
               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):
     return out, err, p
 
 def readpipe(argv, preexec_fn=None, shell=False):