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

abarth at webkit.org abarth at webkit.org
Wed Dec 22 13:58:43 UTC 2010


The following commit has been merged in the debian/experimental branch:
commit f7bdab13da83bad1c78f79566309d32828933224
Author: abarth at webkit.org <abarth at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Sep 30 21:12:29 2010 +0000

    2010-09-30  Adam Barth  <abarth at webkit.org>
    
            Unreviewed.
    
            This patch should stop the sheriffbot from throwing an exception.
    
            * Scripts/webkitpy/common/net/buildbot.py:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@68822 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index b51ed89..38ef6f2 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,11 @@
+2010-09-30  Adam Barth  <abarth at webkit.org>
+
+        Unreviewed.
+
+        This patch should stop the sheriffbot from throwing an exception.
+
+        * Scripts/webkitpy/common/net/buildbot.py:
+
 2010-09-30  Brian Weinstein  <bweinstein at apple.com>
 
         Reviewed by Adam Roben.
diff --git a/WebKitTools/Scripts/webkitpy/common/net/buildbot.py b/WebKitTools/Scripts/webkitpy/common/net/buildbot.py
index 1a5f7f7..92ac79f 100644
--- a/WebKitTools/Scripts/webkitpy/common/net/buildbot.py
+++ b/WebKitTools/Scripts/webkitpy/common/net/buildbot.py
@@ -166,12 +166,13 @@ class Builder(object):
                 failures = set(results.failing_tests())
                 if common_failures == None:
                     common_failures = failures
-                common_failures = common_failures.intersection(failures)
-                if not common_failures:
-                    # current_build doesn't have any failures in common with
-                    # the red build we're worried about.  We assume that any
-                    # failures in current_build were due to flakiness.
-                    break
+                else:
+                    common_failures = common_failures.intersection(failures)
+                    if not common_failures:
+                        # current_build doesn't have any failures in common with
+                        # the red build we're worried about.  We assume that any
+                        # failures in current_build were due to flakiness.
+                        break
             look_back_count += 1
             if look_back_count > look_back_limit:
                 return RegressionWindow(None, current_build, failing_tests=common_failures)

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list