Charm Helpers

Merge lp://qastaging/~michael.nelson/charm-helpers/configure-sources-single-source-null-key into lp://qastaging/charm-helpers

configure-sources-single-source-null-key
Merge into devel

Proposed by Michael Nelson on 2013-10-11

Status:	Merged
Merged at revision:	83
Proposed branch:	lp://qastaging/~michael.nelson/charm-helpers/configure-sources-single-source-null-key
Merge into:	lp://qastaging/charm-helpers
Diff against target:	76 lines (+37/-4) 2 files modified charmhelpers/fetch/__init__.py (+8/-4) tests/fetch/test_fetch.py (+29/-0)
To merge this branch:	bzr merge lp://qastaging/~michael.nelson/charm-helpers/configure-sources-single-source-null-key
Related bugs:	Link a bug report

Reviewer	Review Type	Date Requested	Status
James Page		2013-10-11	Approve on 2013-10-20
Review via email: mp+190546@code.qastaging.launchpad.net

Commit message

fetch.configure_sources can take a single source and a null key.

Description of the change

This branch fixes two issues I came across while working on a charm:

1) fetch.configure_sources already accepted either a list of sources with list of keys (where individual keys could be None), but not a single source with a None key.

2) fetch.add_source() didn't pass sources starting with 'deb ' through, and apt-add-repository gives a different result depending on whether the source starts with 'deb ' in some situations (see example in the test doc string).

Revision history for this message