Merge lp://qastaging/~jelmer/launchpad/601013-bzr-builder-import into lp://qastaging/launchpad
Proposed by
Jelmer Vernooij
| Status: | Merged |
|---|---|
| Approved by: | Brad Crittenden |
| Approved revision: | no longer in the source branch. |
| Merged at revision: | 11159 |
| Proposed branch: | lp://qastaging/~jelmer/launchpad/601013-bzr-builder-import |
| Merge into: | lp://qastaging/launchpad |
| Diff against target: |
47 lines (+12/-3) 3 files modified
lib/lp/code/model/sourcepackagerecipe.py (+1/-1) lib/lp/registry/model/person.py (+1/-1) scripts/ftpmaster-tools/sync-source.py (+10/-1) |
| To merge this branch: | bzr merge lp://qastaging/~jelmer/launchpad/601013-bzr-builder-import |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Brad Crittenden (community) | code | Approve | |
|
Review via email:
|
|||
Commit message
Support use of newer versions of python-debian and bzr-builder.
Description of the change
Trivial change to consistently import RecipeParser from bzrlib.
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
Hi Jelmer,
As we discussed on IRC, please add an XXX comment regarding the import of Dsc. It should state the condition for removing the alternate location. Will that be when the production machines move to Maverick or a PPA is available?
Also, please make sure your comments are properly punctuated...i.e. full-stop.