Merge lp://qastaging/~abentley/bzr-pqm/config-stack-fixes into lp://qastaging/bzr-pqm
Proposed by
Aaron Bentley
| Status: | Merged |
|---|---|
| Approved by: | Martin Packman |
| Approved revision: | 90 |
| Merged at revision: | 90 |
| Proposed branch: | lp://qastaging/~abentley/bzr-pqm/config-stack-fixes |
| Merge into: | lp://qastaging/bzr-pqm |
| Diff against target: |
56 lines (+7/-3) 3 files modified
pqm_submit.py (+4/-1) tests/test_lpland.py (+2/-1) tests/test_pqm_submit.py (+1/-1) |
| To merge this branch: | bzr merge lp://qastaging/~abentley/bzr-pqm/config-stack-fixes |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Martin Packman (community) | Approve | ||
|
Review via email:
|
|||
Commit message
Fix config use for bzr 2.3-2.6dev
Description of the change
This branch fixes the use of configuration. It restores compatibility with 2.4 and earlier by wrapping config stack access. It restores compatibility with bzr.dev by working around bug #948344.
I've run the test suite with bzr 2.3-bzr.dev r6480
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
Extending an using the compat wrapper like this looks fine. Would perhaps be neatest to pull the wrapper logic out of the pqm_submit module but doesn't need to happen here.