Show a joined string rather than list when reporting GIT failures

Signed-off-by: Catalin Marinas <catalin.marinas@gmail.com>

diff --git a/stgit/git.py b/stgit/git.py
index bec691b976390901401b122093491bb836a63ed1..047c0401b53e080e1bf3dbbc0c6b770e85f7378b 100644 (file)
--- a/stgit/git.py
+++ b/stgit/git.py
@@ -158,7 +158,7 @@ def _input(cmd, file_desc):
         p.tochild.write(line)
     p.tochild.close()
     if p.wait():
         p.tochild.write(line)
     p.tochild.close()
     if p.wait():

-        raise GitException, '%s failed (%s)' % (str(cmd),
+        raise GitException, '%s failed (%s)' % (' '.join(cmd),

                                                 p.childerr.read().strip())
 
 def _input_str(cmd, string):
                                                 p.childerr.read().strip())
 
 def _input_str(cmd, string):


@@ -166,14 +166,14 @@ def _input_str(cmd, string):
     p.tochild.write(string)
     p.tochild.close()
     if p.wait():
     p.tochild.write(string)
     p.tochild.close()
     if p.wait():

-        raise GitException, '%s failed (%s)' % (str(cmd),
+        raise GitException, '%s failed (%s)' % (' '.join(cmd),

                                                 p.childerr.read().strip())
 
 def _output(cmd):
     p=popen2.Popen3(cmd, True)
     output = p.fromchild.read()
     if p.wait():
                                                 p.childerr.read().strip())
 
 def _output(cmd):
     p=popen2.Popen3(cmd, True)
     output = p.fromchild.read()
     if p.wait():

-        raise GitException, '%s failed (%s)' % (str(cmd),
+        raise GitException, '%s failed (%s)' % (' '.join(cmd),

                                                 p.childerr.read().strip())
     return output
 
                                                 p.childerr.read().strip())
     return output
 


@@ -185,7 +185,7 @@ def _output_one_line(cmd, file_desc = None):
         p.tochild.close()
     output = p.fromchild.readline().strip()
     if p.wait():
         p.tochild.close()
     output = p.fromchild.readline().strip()
     if p.wait():

-        raise GitException, '%s failed (%s)' % (str(cmd),
+        raise GitException, '%s failed (%s)' % (' '.join(cmd),

                                                 p.childerr.read().strip())
     return output
 
                                                 p.childerr.read().strip())
     return output
 


@@ -193,7 +193,7 @@ def _output_lines(cmd):
     p=popen2.Popen3(cmd, True)
     lines = p.fromchild.readlines()
     if p.wait():
     p=popen2.Popen3(cmd, True)
     lines = p.fromchild.readlines()
     if p.wait():

-        raise GitException, '%s failed (%s)' % (str(cmd),
+        raise GitException, '%s failed (%s)' % (' '.join(cmd),

                                                 p.childerr.read().strip())
     return lines
 
                                                 p.childerr.read().strip())
     return lines