2010-08-10 Dirk Pranke <dpranke@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 863b832cf0e9306c02a78d2391dc2b5a0a69a1de..dcf7e139376b37dd0c10b5d1f0f0f7302d2cfc4f 100644 (file)
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,18 @@
+2010-08-10  Dirk Pranke  <dpranke@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@chromium.org>
 
         Unreviewed, build fix.

diff --git a/WebKitTools/Scripts/webkit-patch b/WebKitTools/Scripts/webkit-patch
index 8300b9faf16ae6367086271d49d147f347e818b1..007f919dea8f835293af501b6aa511c171871561 100755 (executable)
--- 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