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

[tony at chromium.org]

The following commit has been merged in the debian/experimental branch:
commit abbbcd867e80dc8e67343d10e8871ea34fef9ea7
Author: tony at chromium.org <tony at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Sep 24 04:28:31 2010 +0000

    2010-09-23  Tony Chang  <tony at chromium.org>
    
            Unreviewed, rolling out r68232.
            http://trac.webkit.org/changeset/68232
    
            Broken NRWT on the canary bots.
    
            * Scripts/webkitpy/layout_tests/port/chromium.py:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@68234 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 3f09e83..3f67a48 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,12 @@
+2010-09-23  Tony Chang  <tony at chromium.org>
+
+        Unreviewed, rolling out r68232.
+        http://trac.webkit.org/changeset/68232
+
+        Broken NRWT on the canary bots.
+
+        * Scripts/webkitpy/layout_tests/port/chromium.py:
+
 2010-09-23  Dirk Pranke  <dpranke at chromium.org>
 
         Unreviewed, build fix.
diff --git a/WebKitTools/Scripts/webkitpy/layout_tests/port/chromium.py b/WebKitTools/Scripts/webkitpy/layout_tests/port/chromium.py
index f22e4ae..4f3d734 100644
--- a/WebKitTools/Scripts/webkitpy/layout_tests/port/chromium.py
+++ b/WebKitTools/Scripts/webkitpy/layout_tests/port/chromium.py
@@ -83,11 +83,10 @@ class ChromiumPort(base.Port):
     """Abstract base class for Chromium implementations of the Port class."""
 
     def __init__(self, **kwargs):
-        import pdb
-        pdb.set_trace()
         if 'options' in kwargs:
             options = kwargs['options']
-            if (options and not hasattr(options, 'configuration')):
+            if (options and (not hasattr(options, 'configuration') or
+                             options.configuration is None)):
                 options.configuration = 'Release'
         base.Port.__init__(self, **kwargs)
         self._chromium_base_dir = None

-- 
WebKit Debian packaging