Merge lp://staging/~bac/charms/oneiric/buildbot-master/bbm-cleanup into lp://staging/~yellow/charms/oneiric/buildbot-master/trunk
Proposed by
Brad Crittenden
| Status: | Merged |
|---|---|
| Approved by: | Gary Poster |
| Approved revision: | 33 |
| Merged at revision: | 34 |
| Proposed branch: | lp://staging/~bac/charms/oneiric/buildbot-master/bbm-cleanup |
| Merge into: | lp://staging/~yellow/charms/oneiric/buildbot-master/trunk |
| Diff against target: |
129 lines (+29/-14) 3 files modified
hooks/config-changed (+13/-7) hooks/local.py (+15/-6) hooks/wrapper.cfg (+1/-1) |
| To merge this branch: | bzr merge lp://staging/~bac/charms/oneiric/buildbot-master/bbm-cleanup |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Gary Poster (community) | Approve | ||
|
Review via email:
|
|||
Description of the change
This branch fixes a problem with the way the original master.cfg was handled. The function initialize_buildbot moved the master.cfg file to master_original.cfg without regard for whether it had been called before, and substituted in a wrapper config file as master.cfg. So if initialize_buildbot were to be called a second time, then the original config file would be overwritten and we'd have two copies of the wrapper.
The change here is to rename hooks/master.cfg to hooks/wrapper.cfg. The original master.cfg file is never touched. Instead wrapper.cfg includes master.cfg and buildbot.tac is modified to use wrapper.cfg as the configfile to use.
To post a comment you must log in.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
As we discussed, if we switch from the string replace to specifying the wrapper name when we create the master, this will be great. Thank you.