Merge lp:~smoser/maas/trunk.import-ephem-fix into lp:~maas-committers/maas/trunk
Status: | Merged |
---|---|
Approved by: | Scott Moser |
Approved revision: | no longer in the source branch. |
Merged at revision: | 1081 |
Proposed branch: | lp:~smoser/maas/trunk.import-ephem-fix |
Merge into: | lp:~maas-committers/maas/trunk |
Diff against target: |
123 lines (+25/-37) 1 file modified
scripts/maas-import-ephemerals (+25/-37) |
To merge this branch: | bzr merge lp:~smoser/maas/trunk.import-ephem-fix |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Andres Rodriguez (community) | Approve | ||
Launchpad code reviewers | Pending | ||
Review via email: mp+126543@code.launchpad.net |
Commit message
maas-import-
Bug:
if you were importing 2 things, the query_local would not re-set the
'l_dir' (local dir), which caused a sour path to be taken.
cleanups:
* remove 'arch2u' as we only deal with ubuntu arch now. x86_64 is not
valid input that should exist anywhere.
* be less annoying in default output. Now, nothing to do looks like:
precise/amd64: up to date [maas-precise-
precise/i386: up to date [maas-precise-
quantal/amd64: up to date [maas-quantal-
quantal/i386: up to date [maas-quantal-
* replace 2 separate install_tftp_image with a single one
* do not let output of maas-provision to stdout/stderr unless it fails
Description of the change
maas-import-
Bug:
if you were importing 2 things, the query_local would not re-set the
'l_dir' (local dir), which caused a sour path to be taken.
cleanups:
* remove 'arch2u' as we only deal with ubuntu arch now. x86_64 is not
valid input that should exist anywhere.
* be less annoying in default output. Now, nothing to do looks like:
precise/amd64: up to date [maas-precise-
precise/i386: up to date [maas-precise-
quantal/amd64: up to date [maas-quantal-
quantal/i386: up to date [maas-quantal-
* replace 2 separate install_tftp_image with a single one
* do not let output of maas-provision to stdout/stderr unless it fails
Looks good to me.