Merge ~paelzer/cloud-init:fix-bug-1616831-new-and-old-apt-config into cloud-init:master
Status: | Merged |
---|---|
Merged at revision: | 763f403c7b848b31780ef869fb7728b0d5e571a2 |
Proposed branch: | ~paelzer/cloud-init:fix-bug-1616831-new-and-old-apt-config |
Merge into: | cloud-init:master |
Diff against target: |
195 lines (+117/-31) 2 files modified
cloudinit/config/cc_apt_configure.py (+36/-25) tests/unittests/test_handler/test_handler_apt_source_v1.py (+81/-6) |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
cloud-init Commiters | Pending | ||
Review via email: mp+304064@code.launchpad.net |
Description of the change
apt-config: Prefer V3 format if specified together with V1/2 (LP: #1616831)
This set of changes contains the code addressing an issue if V1/2 AND V3 configs are specified at the same time. With these changes the V3 config is preferred now.
There are some sanity checks in place that kick in if the old (now dropped due to the preference) values differ from those that will be used (there would be too much danger to "silently" ignore something of the V1 spec and the user wondering why his changes take no effect.
It also extends and adds unitests in that area to cover even more of the existing and now added format conversion logic.
Passed make check, tox and bddeb+sbuild and thereby I hope ready for review.