Merge branch 'buildbot-0.8.7'

buildbot · Sep 9, 2012 · 7aac669 · 7aac669
2 parents 42155a0 + 7dfb86f
commit 7aac669
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/master/buildbot/schedulers/basic.py b/master/buildbot/schedulers/basic.py
@@ -200,10 +200,10 @@ def getPendingBuildTimes(self):
 
 class SingleBranchScheduler(BaseBasicScheduler):
     def getChangeFilter(self, branch, branches, change_filter, categories):
-        if branch is NotABranch and not change_filter and self.codebases is not None:
+        if branch is NotABranch and not change_filter:
             config.error(
                 "the 'branch' argument to SingleBranchScheduler is " +
-                "mandatory unless change_filter or codebases is provided")
+                "mandatory unless change_filter is provided")
         elif branches is not NotABranch:
             config.error(
                 "the 'branches' argument is not allowed for " +