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

[wsiegrist at apple.com]

The following commit has been merged in the debian/experimental branch:
commit e4e39fef7208a1b5772acaefbd68c5a0b860f429
Author: wsiegrist at apple.com <wsiegrist at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Sep 17 18:00:08 2010 +0000

    2010-09-17 William Siegrist <wsiegrist at apple.com>
    
    Replaces branches option with ChangeFilter since branches is now deprecated.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@67726 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/BuildSlaveSupport/build.webkit.org-config/config.json b/WebKitTools/BuildSlaveSupport/build.webkit.org-config/config.json
index 89a768a..54a0dfe 100644
--- a/WebKitTools/BuildSlaveSupport/build.webkit.org-config/config.json
+++ b/WebKitTools/BuildSlaveSupport/build.webkit.org-config/config.json
@@ -196,7 +196,7 @@
                     }
                   ],
 
-    "schedulers": [ { "type": "AnyBranchScheduler", "name": "trunk", "branches": ["trunk"], "treeStableTimer": 45.0,
+    "schedulers": [ { "type": "AnyBranchScheduler", "name": "trunk", "change_filter": "trunk_filter", "treeStableTimer": 45.0,
                       "builderNames": ["Leopard Intel Release (Build)", "Leopard Intel Debug (Build)",
                                        "SnowLeopard Intel Release (Build)", "SnowLeopard Intel Leaks",
                                        "Windows Release (Build)", "Windows Debug (Build)",
diff --git a/WebKitTools/BuildSlaveSupport/build.webkit.org-config/master.cfg b/WebKitTools/BuildSlaveSupport/build.webkit.org-config/master.cfg
index f30ac16..aca3c65 100644
--- a/WebKitTools/BuildSlaveSupport/build.webkit.org-config/master.cfg
+++ b/WebKitTools/BuildSlaveSupport/build.webkit.org-config/master.cfg
@@ -6,6 +6,7 @@ c = BuildmasterConfig = {}
 from buildbot.buildslave import BuildSlave
 from buildbot.changes.pb import PBChangeSource
 from buildbot.scheduler import AnyBranchScheduler, Triggerable
+from buildbot.schedulers.filter import ChangeFilter
 from buildbot.status import html
 from buildbot.process import buildstep, factory, properties
 from buildbot.steps import master, shell, source, transfer, trigger
@@ -419,6 +420,8 @@ class NewBuildAndTestFactory(BuildAndTestFactory):
 class TestWebKit2Factory(TestFactory):
     TestClass = RunWebKit2Tests
 
+trunk_filter = ChangeFilter(branch=["trunk", None])
+
 def loadBuilderConfig(c):
     # FIXME: These file handles are leaked.
     passwords = simplejson.load(open('passwords.json'))
@@ -431,6 +434,8 @@ def loadBuilderConfig(c):
 
     c['schedulers'] = []
     for scheduler in config['schedulers']:
+        if "change_filter" in scheduler:
+            scheduler["change_filter"] = globals()[scheduler["change_filter"]]
         kls = globals()[scheduler.pop('type')]
         c['schedulers'].append(kls(**scheduler))
 

-- 
WebKit Debian packaging