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

[dpranke at chromium.org]

The following commit has been merged in the webkit-1.1 branch:
commit 45111ebb2f0c6f2e20c3f84226d0ecda68b50015
Author: dpranke at chromium.org <dpranke at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Mar 15 19:57:11 2010 +0000

    2010-03-15  Dirk Pranke  <dpranke at chromium.org>
    
            Reviewed by Alexey Proskuryakov.
    
            Fix a minor case where we'd deference a null pointer if we tried
            to run new-run-webkit-tests on an unsupported platform (e.g.
            Cygwin's python version).
    
            https://bugs.webkit.org/show_bug.cgi?id=36076
    
            * Scripts/webkitpy/layout_tests/port/factory.py:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@56005 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 459b92d..b064c26 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,15 @@
+2010-03-15  Dirk Pranke  <dpranke at chromium.org>
+
+        Reviewed by Alexey Proskuryakov.
+
+        Fix a minor case where we'd deference a null pointer if we tried
+        to run new-run-webkit-tests on an unsupported platform (e.g.
+        Cygwin's python version).
+
+        https://bugs.webkit.org/show_bug.cgi?id=36076
+
+        * Scripts/webkitpy/layout_tests/port/factory.py:
+
 2010-03-15  Darin Adler  <darin at apple.com>
 
         Tell Subversion about more directories that expect to have .pyc files.
diff --git a/WebKitTools/Scripts/webkitpy/layout_tests/port/factory.py b/WebKitTools/Scripts/webkitpy/layout_tests/port/factory.py
index a18df99..cbe61e4 100644
--- a/WebKitTools/Scripts/webkitpy/layout_tests/port/factory.py
+++ b/WebKitTools/Scripts/webkitpy/layout_tests/port/factory.py
@@ -49,6 +49,10 @@ def get(port_name=None, options=None):
             else:
                 port_to_use = 'mac'
 
+    if port_to_use is None:
+        raise NotImplementedError('unknown port; sys.platform = "%s"' %
+                                  sys.platform)
+
     if port_to_use == 'test':
         import test
         return test.TestPort(port_name, options)

-- 
WebKit Debian packaging