Merge lp:~gnuoy/charm-helpers/restore-distro-src into lp:charm-helpers

[Liam Young]

The (inadvertent?) removal of distro as a valid source has broken a number of openstack charms. This mp restores it and adds a unit_test to check for it

[James Page (james-page)]

review: Approve

=== modified file 'charmhelpers/fetch/__init__.py'
--- charmhelpers/fetch/__init__.py	2014-09-23 16:34:54 +0000
+++ charmhelpers/fetch/__init__.py	2014-10-20 15:33:24 +0000
@@ -218,6 +218,7 @@
         pocket for the release.
         'cloud:' may be used to activate official cloud archive pockets,
         such as 'cloud:icehouse'
+        'distro' may be used as a noop
 
     @param key: A key to be added to the system's APT keyring and used
     to verify the signatures on packages. Ideally, this should be an
@@ -251,6 +252,8 @@
         release = lsb_release()['DISTRIB_CODENAME']
         with open('/etc/apt/sources.list.d/proposed.list', 'w') as apt:
             apt.write(PROPOSED_POCKET.format(release))
+    elif source == 'distro':
+        pass
     else:
         raise SourceConfigError("Unknown source: {!r}".format(source))
 

=== modified file 'tests/fetch/test_fetch.py'
--- tests/fetch/test_fetch.py	2014-09-11 23:11:20 +0000
+++ tests/fetch/test_fetch.py	2014-10-20 15:33:24 +0000
@@ -227,6 +227,11 @@
         source = "propsed"  # Minor typo
         self.assertRaises(fetch.SourceConfigError, fetch.add_source, source)
 
+    def test_add_distro_source(self):
+        source = "distro"
+        # distro is a noop but test validate no exception is thrown
+        fetch.add_source(source=source)
+
     @patch.object(fetch, 'config')
     @patch.object(fetch, 'add_source')
     def test_configure_sources_single_source(self, add_source, config):