From: Rob Browning <rlb@defaultvalue.org>
Date: Sat, 4 Nov 2017 18:52:28 +0000 (-0500)
Subject: _git_wait: pass cmd to GitError through shstr
X-Git-Tag: 0.30~157
X-Git-Url: https://arthur.barton.de/gitweb/?p=bup.git;a=commitdiff_plain;h=b22a2d815444007637ee1dc676f618439b3f160f

_git_wait: pass cmd to GitError through shstr

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

diff --git a/lib/bup/git.py b/lib/bup/git.py
index f39e9a3..798bea2 100644
--- a/lib/bup/git.py
+++ b/lib/bup/git.py
@@ -14,7 +14,7 @@ from bup.helpers import (Sha1, add_error, chunkyreader, debug1, debug2,
                          hostname, localtime, log, merge_iter,
                          mmap_read, mmap_readwrite,
                          parse_num,
-                         progress, qprogress, stat_if_exists,
+                         progress, qprogress, shstr, stat_if_exists,
                          unlink, username, userfullname,
                          utc_offset_str)
 
@@ -36,7 +36,7 @@ class GitError(Exception):
 def _git_wait(cmd, p):
     rv = p.wait()
     if rv != 0:
-        raise GitError('%s returned %d' % (cmd, rv))
+        raise GitError('%s returned %d' % (shstr(cmd), rv))
 
 def _git_capture(argv):
     p = subprocess.Popen(argv, stdout=subprocess.PIPE, preexec_fn = _gitenv())