Merge lp:~abentley/launchpad/append-distroseries into lp:launchpad
| Status: | Merged |
|---|---|
| Approved by: | Tim Penhey |
| Approved revision: | no longer in the source branch. |
| Merged at revision: | not available |
| Proposed branch: | lp:~abentley/launchpad/append-distroseries |
| Merge into: | lp:launchpad |
| Diff against target: |
127 lines (+15/-9) 6 files modified
lib/canonical/buildd/buildrecipe (+4/-2) lib/canonical/buildd/sourcepackagerecipe.py (+4/-1) lib/lp/code/model/recipebuilder.py (+3/-3) lib/lp/code/tests/test_recipebuilder.py (+2/-1) utilities/lp.pylintrc (+1/-1) utilities/sourcedeps.conf (+1/-1) |
| To merge this branch: | bzr merge lp:~abentley/launchpad/append-distroseries |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Tim Penhey (community) | Approve | ||
|
Review via email:
|
|||
Commit message
Append distroseries to debversion
Description of the change
= Summary =
Provide distroseries in debversion, to prevent builds that differ only by
distroseries from having the same debversion.
== Proposed fix ==
Require a newer version of bzr-builder which supports --append-version.
Pass the distroseries name into the buildd.
Call bzr-builder with --append-version $distroseries.
== Pre-implementation notes ==
Preimplementation was with james_w
== Implementation details ==
Various lint fixes were done as drivebys. Globally suppressed F0401, "Unable
to import", because it produces excessive false positives, and legitimate
instances of this issue would be caught by the test suite anyhow.
== Tests ==
bin/test test_recipebuilder
== Demo and Q/A ==
Should be tested on dogfood.
= Launchpad lint =
Checking for conflicts. and issues in doctests and templates.
Running jslint, xmllint, pyflakes, and pylint.
Using normal rules.
Linting changed files:
utilities/
lib/canonical
lib/canonical
utilities/
lib/lp/
lib/lp/
Seems fine.