[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373

[eric at webkit.org]

The following commit has been merged in the webkit-1.2 branch:
commit 8bd0d2824bbafd16ad734f781212207070349ab5
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Nov 20 06:20:51 2009 +0000

    2009-11-19  Zoltan Horvath  <zoltan at webkit.org>
    
            Reviewed by Adam Barth.
    
            Remove inserting stderr into patch in bugzilla-tool
            https://bugs.webkit.org/show_bug.cgi?id=29914
    
            Modify SCM python module's run_command function to avoid return of stderr
            by default, so stderr won't be inserted into the patches.
            Modify the related unit test.
    
            * Scripts/modules/scm.py:
            * Scripts/modules/scm_unittest.py:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@51230 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 24e56d6..87bb496 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,17 @@
+2009-11-19  Zoltan Horvath  <zoltan at webkit.org>
+
+        Reviewed by Adam Barth.
+
+        Remove inserting stderr into patch in bugzilla-tool
+        https://bugs.webkit.org/show_bug.cgi?id=29914
+
+        Modify SCM python module's run_command function to avoid return of stderr
+        by default, so stderr won't be inserted into the patches.
+        Modify the related unit test.
+
+        * Scripts/modules/scm.py:
+        * Scripts/modules/scm_unittest.py:
+
 2009-11-19  Eric Seidel  <eric at webkit.org>
 
         Reviewed by Adam Barth.
diff --git a/WebKitTools/Scripts/modules/scm.py b/WebKitTools/Scripts/modules/scm.py
index 40ace42..77b3a21 100644
--- a/WebKitTools/Scripts/modules/scm.py
+++ b/WebKitTools/Scripts/modules/scm.py
@@ -123,14 +123,18 @@ class SCM:
         self.dryrun = dryrun
 
     @staticmethod
-    def run_command(args, cwd=None, input=None, error_handler=default_error_handler, return_exit_code=False):
+    def run_command(args, cwd=None, input=None, error_handler=default_error_handler, return_exit_code=False, return_stderr=False):
         if hasattr(input, 'read'): # Check if the input is a file.
             stdin = input
             string_to_communicate = None
         else:
             stdin = subprocess.PIPE if input else None
             string_to_communicate = input
-        process = subprocess.Popen(args, stdin=stdin, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, cwd=cwd)
+        if return_stderr:
+            stderr = subprocess.STDOUT
+        else:
+            stderr = None
+        process = subprocess.Popen(args, stdin=stdin, stdout=subprocess.PIPE, stderr=stderr, cwd=cwd)
         output = process.communicate(string_to_communicate)[0]
         exit_code = process.wait()
         if exit_code:
diff --git a/WebKitTools/Scripts/modules/scm_unittest.py b/WebKitTools/Scripts/modules/scm_unittest.py
index 577918b..a323aff 100644
--- a/WebKitTools/Scripts/modules/scm_unittest.py
+++ b/WebKitTools/Scripts/modules/scm_unittest.py
@@ -153,7 +153,8 @@ svn: resource out of date; try updating
 
         command_returns_non_zero = ['/bin/sh', '--invalid-option']
         self.assertRaises(ScriptError, SCM.run_command, command_returns_non_zero)
-        self.assertTrue(SCM.run_command(command_returns_non_zero, error_handler=ignore_error))
+        # Check if returns error text:
+        self.assertTrue(SCM.run_command(command_returns_non_zero, error_handler=ignore_error, return_stderr=True))
 
         self.assertRaises(CheckoutNeedsUpdate, commit_error_handler, ScriptError(output=git_failure_message))
         self.assertRaises(CheckoutNeedsUpdate, commit_error_handler, ScriptError(output=svn_failure_message))

-- 
WebKit Debian packaging