Merge lp:~jtv/maas/bug-1324237 into lp:~maas-committers/maas/trunk
Status: | Merged | ||||
---|---|---|---|---|---|
Approved by: | Jeroen T. Vermeulen | ||||
Approved revision: | no longer in the source branch. | ||||
Merged at revision: | 2387 | ||||
Proposed branch: | lp:~jtv/maas/bug-1324237 | ||||
Merge into: | lp:~maas-committers/maas/trunk | ||||
Diff against target: |
297 lines (+64/-70) 7 files modified
src/provisioningserver/boot/utils.py (+3/-5) src/provisioningserver/dns/config.py (+2/-4) src/provisioningserver/import_images/tests/test_boot_resources.py (+1/-1) src/provisioningserver/omshell.py (+3/-3) src/provisioningserver/tests/test_omshell.py (+3/-2) src/provisioningserver/utils/__init__.py (+15/-21) src/provisioningserver/utils/tests/test_utils.py (+37/-34) |
||||
To merge this branch: | bzr merge lp:~jtv/maas/bug-1324237 | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Julian Edwards (community) | Approve | ||
Review via email: mp+221469@code.launchpad.net |
Commit message
Report stderr output from failing commands as part of the exception, so that we can see what went wrong. Fold call_capture_
Description of the change
There really was no need for call_capture_
In one place, when verifying GPG signatures for downloaded boot loaders, we passed stderr=
Jeroen
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
review: approve
Tip top. www.enigmail. net/
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1
Comment: Using GnuPG with Thunderbird - http://
iEYEARECAAYFAlO H5RUACgkQWhGlTF 8G/HcPxgCfaZoiH pq9rsdRdzL2enKj Rr4s gRJHWyXHwmA3IHO qz
QGoAn3ei7ULYIgq
=cKta
-----END PGP SIGNATURE-----