[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.22-985-g3c00f00

[abarth at webkit.org]

The following commit has been merged in the webkit-1.1 branch:
commit 3f43be7a29b8ab24a9c9e8c76215a1c2751a08b8
Author: abarth at webkit.org <abarth at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Mar 15 06:16:14 2010 +0000

    2010-03-14  Adam Barth  <abarth at webkit.org>
    
            Unreviewed.
    
            Fix the webkit-patch bots.  Turns out they need the path of the main
            script to run properly.
    
            * Scripts/webkit-patch:
            * Scripts/webkitpy/patch/patcher.py:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@55983 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index bdb410d..7fcc387 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,13 @@
+2010-03-14  Adam Barth  <abarth at webkit.org>
+
+        Unreviewed.
+
+        Fix the webkit-patch bots.  Turns out they need the path of the main
+        script to run properly.
+
+        * Scripts/webkit-patch:
+        * Scripts/webkitpy/patch/patcher.py:
+
 2010-03-14  Darin Adler  <darin at apple.com>
 
         Tell Subversion about more directories that expect to have .pyc files.
diff --git a/WebKitTools/Scripts/webkit-patch b/WebKitTools/Scripts/webkit-patch
index 34adef7..b78786b 100755
--- a/WebKitTools/Scripts/webkit-patch
+++ b/WebKitTools/Scripts/webkit-patch
@@ -62,7 +62,7 @@ def main():
     # version warning.
     from webkitpy.patch.patcher import WebKitPatch
 
-    WebKitPatch().main()
+    WebKitPatch(__file__).main()
 
 
 if __name__ == "__main__":
diff --git a/WebKitTools/Scripts/webkitpy/patch/patcher.py b/WebKitTools/Scripts/webkitpy/patch/patcher.py
index 0f17678..9749cd3 100755
--- a/WebKitTools/Scripts/webkitpy/patch/patcher.py
+++ b/WebKitTools/Scripts/webkitpy/patch/patcher.py
@@ -53,9 +53,10 @@ class WebKitPatch(MultiCommandTool):
         make_option("--status-host", action="store", dest="status_host", type="string", nargs=1, help="Hostname (e.g. localhost or commit.webkit.org) where status updates should be posted."),
     ]
 
-    def __init__(self):
+    def __init__(self, path):
         MultiCommandTool.__init__(self)
 
+        self._path = path
         self.bugs = Bugzilla()
         self.buildbot = BuildBot()
         self.executive = Executive()
@@ -81,7 +82,7 @@ class WebKitPatch(MultiCommandTool):
         return self._scm
 
     def path(self):
-        return __file__
+        return self._path
 
     def should_show_in_main_help(self, command):
         if not command.show_in_main_help:

-- 
WebKit Debian packaging