Don't fail just because a subprocess wrote stuff to stderr

Instead, pass the message on to the user and assume the subprocess was
successful. We need to do this since some git commands print warnings
on stderr even though they succeed.

Signed-off-by: Karl Hasselström <kha@treskal.com>

diff --git a/stgit/run.py b/stgit/run.py
index ae3a2e1629a9bec3af9c36589c957da0c47feb4a..94dd98e95cc47976bdde593b417d351bd40ccc40 100644 (file)
--- a/stgit/run.py
+++ b/stgit/run.py
@@ -79,9 +79,12 @@ class Run:
         errdata = p.childerr.read()
         self.exitcode = p.wait() >> 8
         self.__log_end(self.exitcode)
         errdata = p.childerr.read()
         self.exitcode = p.wait() >> 8
         self.__log_end(self.exitcode)

-        if errdata or self.exitcode not in self.__good_retvals:
+        if self.exitcode not in self.__good_retvals:

             raise self.exc('%s failed with code %d:\n%s'
                            % (cmd[0], self.exitcode, errdata))
             raise self.exc('%s failed with code %d:\n%s'
                            % (cmd[0], self.exitcode, errdata))

+        if errdata:
+            out.warn('call to %s succeeded, but generated a warning:' % cmd[0])
+            out.err_raw(errdata)

         return outdata
     def __run_noshell(self, cmd):
         """Run without captured IO. Note: arguments are not parsed by
         return outdata
     def __run_noshell(self, cmd):
         """Run without captured IO. Note: arguments are not parsed by