[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 3d45ea6af175ad363d84f0c23ebd537f68b9d931
Author: dpranke at chromium.org <dpranke at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Aug 11 06:19:23 2010 +0000

    2010-08-10  Dirk Pranke  <dpranke at chromium.org>
    
            Reviewed by Eric Seidel.
    
            webkit-patch should refuse to run under Win32 Python
            https://bugs.webkit.org/show_bug.cgi?id=40962
    
            Given that there are lots of places in webkit-patch's code that
            assume unix-style filenames (forward slashes), webkit-patch fails
            with weird file-not-found errors when run under a native windows
            Python. It would be nice if we just trapped this and errored out
            at the beginning, rather than producing unpredictable errors.
    
            * Scripts/webkit-patch:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@65126 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 863b832..dcf7e13 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,18 @@
+2010-08-10  Dirk Pranke  <dpranke at chromium.org>
+
+        Reviewed by Eric Seidel.
+
+        webkit-patch should refuse to run under Win32 Python
+        https://bugs.webkit.org/show_bug.cgi?id=40962
+
+        Given that there are lots of places in webkit-patch's code that
+        assume unix-style filenames (forward slashes), webkit-patch fails
+        with weird file-not-found errors when run under a native windows
+        Python. It would be nice if we just trapped this and errored out
+        at the beginning, rather than producing unpredictable errors.
+
+        * Scripts/webkit-patch:
+
 2010-08-10  Kent Tamura  <tkent at chromium.org>
 
         Unreviewed, build fix.
diff --git a/WebKitTools/Scripts/webkit-patch b/WebKitTools/Scripts/webkit-patch
index 8300b9f..007f919 100755
--- a/WebKitTools/Scripts/webkit-patch
+++ b/WebKitTools/Scripts/webkit-patch
@@ -38,6 +38,7 @@ import sys
 from webkitpy.common.system.logutils import configure_logging
 import webkitpy.python24.versioning as versioning
 
+_log = logging.getLogger("webkit-patch")
 
 def main():
     # This is a hack to let us enable DEBUG logging as early as possible.
@@ -50,6 +51,11 @@ def main():
     configure_logging(logging_level=logging_level)
 
     versioning.check_version()
+    
+    if sys.platform == "win32":
+        _log.fatal("webkit-patch is only supported under Cygwin Python, "
+                   "not Win32 Python")
+        sys.exit(1)
 
     # Import webkit-patch code only after version-checking so that
     # script doesn't error out before having a chance to report the

-- 
WebKit Debian packaging