[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[dpranke at chromium.org]

The following commit has been merged in the debian/experimental branch:
commit 8b646436570c82be04074fe106bee8dd6e899e76
Author: dpranke at chromium.org <dpranke at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sun Nov 7 02:44:15 2010 +0000

    2010-11-06  Dirk Pranke  <dpranke at chromium.org>
    
            Unreviewed, build breakage.
    
            Apparently I uploaded the wrong version of the file to fix 49122
            and neither Eric or I noticed - it was missing a dirname() call.
            Fixing ...
    
            https://bugs.webkit.org/show_bug.cgi?id=49122
    
            * Scripts/webkitpy/common/checkout/scm.py:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@71473 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index c509f7f..c04460f 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,5 +1,17 @@
 2010-11-06  Dirk Pranke  <dpranke at chromium.org>
 
+        Unreviewed, build breakage.
+
+        Apparently I uploaded the wrong version of the file to fix 49122
+        and neither Eric or I noticed - it was missing a dirname() call.
+        Fixing ...
+
+        https://bugs.webkit.org/show_bug.cgi?id=49122
+
+        * Scripts/webkitpy/common/checkout/scm.py:
+
+2010-11-06  Dirk Pranke  <dpranke at chromium.org>
+
         Reviewed by Eric Seidel.
 
         webkitpy/tool/* unittests change cwd and don't clean up properly
diff --git a/WebKitTools/Scripts/webkitpy/common/checkout/scm.py b/WebKitTools/Scripts/webkitpy/common/checkout/scm.py
index 7870fff..8aadcb8 100644
--- a/WebKitTools/Scripts/webkitpy/common/checkout/scm.py
+++ b/WebKitTools/Scripts/webkitpy/common/checkout/scm.py
@@ -64,7 +64,7 @@ def default_scm():
     cwd = os.getcwd()
     scm_system = detect_scm_system(cwd)
     if not scm_system:
-        script_directory = os.path.abspath(__file__)
+        script_directory = os.path.dirname(os.path.abspath(__file__))
         scm_system = detect_scm_system(script_directory)
         if scm_system:
             log("The current directory (%s) is not a WebKit checkout, using %s" % (cwd, scm_system.checkout_root))

-- 
WebKit Debian packaging