[SCM] WebKit Debian packaging branch, webkit-1.3, updated. upstream/1.3.7-4207-g178b198

[abarth at webkit.org]

The following commit has been merged in the webkit-1.3 branch:
commit 850d43687ba590dc801c25cc0354f670242657b5
Author: abarth at webkit.org <abarth at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Jan 12 12:29:29 2011 +0000

    2011-01-12  Adam Barth  <abarth at webkit.org>
    
            Reviewed by Eric Seidel.
    
            Make webkit-patch support subdirectories for SVN checkouts
            https://bugs.webkit.org/show_bug.cgi?id=52261
    
            os.relpath does not exist on Python 2.5, so we need to call our version
            of the API.
    
            * Scripts/webkitpy/common/checkout/scm.py:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@75600 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Tools/ChangeLog b/Tools/ChangeLog
index 591bba6..33d1d86 100644
--- a/Tools/ChangeLog
+++ b/Tools/ChangeLog
@@ -1,3 +1,15 @@
+2011-01-12  Adam Barth  <abarth at webkit.org>
+
+        Reviewed by Eric Seidel.
+
+        Make webkit-patch support subdirectories for SVN checkouts
+        https://bugs.webkit.org/show_bug.cgi?id=52261
+
+        os.relpath does not exist on Python 2.5, so we need to call our version
+        of the API.
+
+        * Scripts/webkitpy/common/checkout/scm.py:
+
 2011-01-11  Maciej Stachowiak  <mjs at apple.com>
 
         Reviewed by Eric Seidel.
diff --git a/Tools/Scripts/webkitpy/common/checkout/scm.py b/Tools/Scripts/webkitpy/common/checkout/scm.py
index 823438c..9cfdaa4 100644
--- a/Tools/Scripts/webkitpy/common/checkout/scm.py
+++ b/Tools/Scripts/webkitpy/common/checkout/scm.py
@@ -36,6 +36,7 @@ import shutil
 
 from webkitpy.common.system.executive import Executive, run_command, ScriptError
 from webkitpy.common.system.deprecated_logging import error, log
+import webkitpy.common.system.ospath as ospath
 from webkitpy.common.memoized import memoized
 
 
@@ -328,7 +329,7 @@ class SVN(SCM):
         if patch_directories == []:
             raise ScriptError(script_args=svn_info_args, message='Empty list of patch directories passed to SCM.__init__')
         elif patch_directories == None:
-            self._patch_directories = [os.path.relpath(cwd, self.checkout_root)]
+            self._patch_directories = [ospath.relpath(cwd, self.checkout_root)]
         else:
             self._patch_directories = patch_directories
 

-- 
WebKit Debian packaging