Allow c['mergeRequests'] = True

This is the default, and therefore unnecessary, but it shouldn't be explicitly disallowed. Refs #2008.
buildbot · Jun 25, 2011 · 8893166 · 8893166
1 parent 977eb41
commit 8893166
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/master/buildbot/master.py b/master/buildbot/master.py
@@ -293,7 +293,8 @@ def do_load(_):
                         isinstance(logMaxTailSize, int):
                     raise ValueError("logMaxTailSize needs to be None or int")
                 mergeRequests = config.get('mergeRequests')
-                if mergeRequests not in (None, False) and not callable(mergeRequests):
+                if (mergeRequests not in (None, True, False)
+                            and not callable(mergeRequests)):
                     raise ValueError("mergeRequests must be a callable or False")
                 prioritizeBuilders = config.get('prioritizeBuilders')
                 if prioritizeBuilders is not None and not callable(prioritizeBuilders):