Discard stderr when determining if a patch is already applied

An error from git-apply just means that the patch isn't applied.

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

diff --git a/stgit/git.py b/stgit/git.py
index f847cceda444ca9c2098ca1f732c2f4b4c8a0164..181e10d14d32a9faccd32d1f4a9a13b95a66177e 100644 (file)
--- a/stgit/git.py
+++ b/stgit/git.py
@@ -628,7 +628,8 @@ def apply_diff(rev1, rev2, check_index = True, files = None):
     diff_str = diff(files, rev1, rev2)
     if diff_str:
         try:
     diff_str = diff(files, rev1, rev2)
     if diff_str:
         try:

-            GRun('git-apply', *index_opt).raw_input(diff_str).no_output()
+            GRun('git-apply', *index_opt).raw_input(
+                diff_str).discard_stderr().no_output()

         except GitRunException:
             return False
 
         except GitRunException:
             return False
 

diff --git a/stgit/run.py b/stgit/run.py
index 29f8f71f9e9d7b2bedd793c284a9fc73e1165e44..7986f3b04e33d2d24d420eda7e7d88b1932e54d2 100644 (file)
--- a/stgit/run.py
+++ b/stgit/run.py
@@ -43,6 +43,7 @@ class Run:
         self.__good_retvals = [0]
         self.__env = None
         self.__indata = None
         self.__good_retvals = [0]
         self.__env = None
         self.__indata = None

+        self.__discard_stderr = False

     def __log_start(self):
         if _log_mode == 'debug':
             out.start('Running subprocess %s' % self.__cmd)
     def __log_start(self):
         if _log_mode == 'debug':
             out.start('Running subprocess %s' % self.__cmd)


@@ -65,11 +66,14 @@ class Run:
         try:
             p = subprocess.Popen(self.__cmd, env = self.__env,
                                  stdin = subprocess.PIPE,
         try:
             p = subprocess.Popen(self.__cmd, env = self.__env,
                                  stdin = subprocess.PIPE,

-                                 stdout = subprocess.PIPE)
+                                 stdout = subprocess.PIPE,
+                                 stderr = subprocess.PIPE)

             outdata, errdata = p.communicate(self.__indata)
             self.exitcode = p.returncode
         except OSError, e:
             raise self.exc('%s failed: %s' % (self.__cmd[0], e))
             outdata, errdata = p.communicate(self.__indata)
             self.exitcode = p.returncode
         except OSError, e:
             raise self.exc('%s failed: %s' % (self.__cmd[0], e))

+        if errdata and not self.__discard_stderr:
+            out.err_raw(errdata)

         self.__log_end(self.exitcode)
         self.__check_exitcode()
         return outdata
         self.__log_end(self.exitcode)
         self.__check_exitcode()
         return outdata


@@ -87,6 +91,9 @@ class Run:
     def returns(self, retvals):
         self.__good_retvals = retvals
         return self
     def returns(self, retvals):
         self.__good_retvals = retvals
         return self

+    def discard_stderr(self, discard = True):
+        self.__discard_stderr = discard
+        return self

     def env(self, env):
         self.__env = dict(os.environ)
         self.__env.update(env)
     def env(self, env):
         self.__env = dict(os.environ)
         self.__env.update(env)