Merge lp://staging/~freyes/charm-helpers/lp1660630 into lp://staging/charm-helpers
Proposed by
Felipe Reyes
| Status: | Merged |
|---|---|
| Merged at revision: | 692 |
| Proposed branch: | lp://staging/~freyes/charm-helpers/lp1660630 |
| Merge into: | lp://staging/charm-helpers |
| Diff against target: |
277 lines (+73/-18) 10 files modified
charmhelpers/contrib/database/mysql.py (+5/-1) charmhelpers/contrib/hardening/templating.py (+5/-1) charmhelpers/contrib/mellanox/infiniband.py (+6/-1) charmhelpers/contrib/network/ip.py (+16/-4) charmhelpers/contrib/openstack/context.py (+4/-1) charmhelpers/contrib/openstack/templating.py (+8/-2) charmhelpers/contrib/python/packages.py (+9/-2) tests/contrib/network/test_ip.py (+9/-2) tests/contrib/openstack/test_os_templating.py (+4/-1) tests/contrib/python/test_packages.py (+7/-3) |
| To merge this branch: | bzr merge lp://staging/~freyes/charm-helpers/lp1660630 |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Stuart Bishop (community) | Approve | ||
|
Review via email:
|
|||
Description of the change
Verify python version to decide which package to install
Check using six.PY2 to decide if python-foo or python3-foo package should be installed after an ImportError exception.
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
Thanks for this.
I think this is changing quite a lot of untested codepaths, but that is the way of contrib.
Lint free and tests all pass.