Merge lp://staging/~rockstar/launchpad/no-arm-recipe-build into lp://staging/launchpad

Proposed by Paul Hummer
Status: Merged
Approved by: Edwin Grubbs
Approved revision: no longer in the source branch.
Merged at revision: 10872
Proposed branch: lp://staging/~rockstar/launchpad/no-arm-recipe-build
Merge into: lp://staging/launchpad
Diff against target: 169 lines (+44/-8)
6 files modified
lib/lp/code/browser/tests/test_sourcepackagerecipe.py (+8/-0)
lib/lp/code/interfaces/sourcepackagerecipe.py (+0/-2)
lib/lp/code/model/sourcepackagerecipebuild.py (+4/-1)
lib/lp/code/model/tests/test_sourcepackagerecipe.py (+6/-0)
lib/lp/code/model/tests/test_sourcepackagerecipebuild.py (+21/-4)
lib/lp/testing/factory.py (+5/-1)
To merge this branch: bzr merge lp://staging/~rockstar/launchpad/no-arm-recipe-build
Reviewer Review Type Date Requested Status
Edwin Grubbs (community) Approve
Review via email: mp+25364@code.staging.launchpad.net

Description of the change

There's a new ARM builder! Yay! At UDS though, we realized that we didn't
have constraints to make sure that SourcePackageRecipeBuilds didn't try to use
that ARM builder. Bad things happen when it does try to use the ARM builder.
There's a deeper problem that Soyuz has to figure out, but this branch fixes
the current problem. Translations has already landed a fix to production with
a similar fix.

I also removed some lint I noticed...

To post a comment you must log in.
Revision history for this message
Edwin Grubbs (edwin-grubbs) wrote :

Go for it.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.