Merge lp:~michael.nelson/launchpad/527617_aborted_build_job into lp:launchpad
Status: | Merged | ||||
---|---|---|---|---|---|
Approved by: | Graham Binns | ||||
Approved revision: | no longer in the source branch. | ||||
Merged at revision: | not available | ||||
Proposed branch: | lp:~michael.nelson/launchpad/527617_aborted_build_job | ||||
Merge into: | lp:launchpad | ||||
Diff against target: |
31 lines (+4/-2) 2 files modified
lib/lp/buildmaster/model/packagebuildfarmjob.py (+1/-1) lib/lp/soyuz/doc/buildd-slavescanner.txt (+3/-1) |
||||
To merge this branch: | bzr merge lp:~michael.nelson/launchpad/527617_aborted_build_job | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Graham Binns (community) | code | Approve | |
Review via email: mp+20968@code.launchpad.net |
Commit message
Aborting a build job sets the buildstate to NEEDSBUILD rather than BUILDING.
Description of the change
This simple fix ensures that when a build job is aborted, the buildstate of the build is set to NEEDSBUILD.
The documentation test always stated: "ABORTED -> builder was aborted, release builder and reset job for the next build round", but the state of the actual build was never included in the test.
This bug seems to be the cause of bug 499421 and bug 527617.
I tried to chase this change back to find where it was introduced, but it goes way back past 2006 (being moved from one file to the next in various refactorings, I stopped at `bzr diff -c 3691.93.27`).
To test:
bin/test -t doc/buildd-
Approved, with the reviewer agog at the simplicity.