Merge lp:~jtv/maas/bug-1305118 into lp:~maas-committers/maas/trunk
Proposed by
Jeroen T. Vermeulen
Status: | Merged | ||||
---|---|---|---|---|---|
Approved by: | Jeroen T. Vermeulen | ||||
Approved revision: | no longer in the source branch. | ||||
Merged at revision: | 2248 | ||||
Proposed branch: | lp:~jtv/maas/bug-1305118 | ||||
Merge into: | lp:~maas-committers/maas/trunk | ||||
Diff against target: |
26 lines (+3/-2) 2 files modified
src/provisioningserver/config.py (+1/-1) src/provisioningserver/tests/test_config.py (+2/-1) |
||||
To merge this branch: | bzr merge lp:~jtv/maas/bug-1305118 | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Raphaël Badin (community) | Approve | ||
Review via email: mp+214966@code.launchpad.net |
Commit message
For the default simplestreams path, use the -v2 data, not the old data. Otherwise, the import script breaks with a KeyError on items['subarches'].
Description of the change
Discovered this because a new maas-test change tries to make use of the default. We didn't normally notice because both the maas source tree and the packages provide a bootresources.yaml with explicit path values.
Jeroen
To post a comment you must log in.