Title: [119532] trunk/Tools
- Revision
- 119532
- Author
- [email protected]
- Date
- 2012-06-05 15:45:01 -0700 (Tue, 05 Jun 2012)
Log Message
Buildbot fix.
* BuildSlaveSupport/build.webkit.org-config/master.cfg: We lose the type attribute earlier
in the function. Store in a local variable.
(loadBuilderConfig):
Modified Paths
Diff
Modified: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/master.cfg (119531 => 119532)
--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/master.cfg 2012-06-05 22:28:02 UTC (rev 119531)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/master.cfg 2012-06-05 22:45:01 UTC (rev 119532)
@@ -860,7 +860,8 @@
platform = builder['platform']
- factory = globals()["%sFactory" % builder.pop('type')]
+ builderType = builder.pop('type')
+ factory = globals()["%sFactory" % builderType]
factoryArgs = []
for key in "platform", "configuration", "architectures", "triggers":
value = builder.pop(key, None)
@@ -884,7 +885,7 @@
else:
builder["category"] = 'misc'
- if (builder['category'] == 'AppleMac' or builder['category'] == 'AppleWin') and builder.get('type', 'unknownType') != 'Build':
+ if (builder['category'] == 'AppleMac' or builder['category'] == 'AppleWin') and builderType != 'Build':
builder['nextBuild'] = pickLatestBuild
c['builders'].append(builder)
Modified: trunk/Tools/ChangeLog (119531 => 119532)
--- trunk/Tools/ChangeLog 2012-06-05 22:28:02 UTC (rev 119531)
+++ trunk/Tools/ChangeLog 2012-06-05 22:45:01 UTC (rev 119532)
@@ -2,6 +2,14 @@
Buildbot fix.
+ * BuildSlaveSupport/build.webkit.org-config/master.cfg: We lose the type attribute earlier
+ in the function. Store in a local variable.
+ (loadBuilderConfig):
+
+2012-06-05 Jon Lee <[email protected]>
+
+ Buildbot fix.
+
* BuildSlaveSupport/build.webkit.org-config/master.cfg:
(loadBuilderConfig):
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
