[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 fc9fb8b4a3d67e0d3076f8c7a371de212ab4c4e2
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Jan 11 05:11:21 2010 +0000

    2010-01-10  Adam Barth  <abarth at webkit.org>
    
            Reviewed by Darin Adler.
    
            Let webkit-patch work with options in $EDITOR
            https://bugs.webkit.org/show_bug.cgi?id=33414
    
            The $EDITOR evironment variable might have command line options like
            bbedit -w.  This patch lets us run those $EDITORs.
    
            * Scripts/webkitpy/user.py:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@53063 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 949d0ac..13f2b2f 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,15 @@
+2010-01-10  Adam Barth  <abarth at webkit.org>
+
+        Reviewed by Darin Adler.
+
+        Let webkit-patch work with options in $EDITOR
+        https://bugs.webkit.org/show_bug.cgi?id=33414
+
+        The $EDITOR evironment variable might have command line options like
+        bbedit -w.  This patch lets us run those $EDITORs.
+
+        * Scripts/webkitpy/user.py:
+
 2010-01-10  Robert Hogan  <robert at roberthogan.net>
 
         Reviewed by Adam Barth.
diff --git a/WebKitTools/Scripts/webkitpy/user.py b/WebKitTools/Scripts/webkitpy/user.py
index 50a4e0d..8dbf74c 100644
--- a/WebKitTools/Scripts/webkitpy/user.py
+++ b/WebKitTools/Scripts/webkitpy/user.py
@@ -27,6 +27,7 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 import os
+import shlex
 import subprocess
 import webbrowser
 
@@ -36,7 +37,8 @@ class User(object):
 
     def edit(self, files):
         editor = os.environ.get("EDITOR") or "vi"
-        subprocess.call([editor] + files)
+        args = shlex.split(editor)
+        subprocess.call(args + files)
 
     def page(self, message):
         pager = os.environ.get("PAGER") or "less"

-- 
WebKit Debian packaging