Merge lp:~james-page/software-properties/juno-support into lp:software-properties

[James Page]

Add support for cloud-archive:juno

[Scott Moser (smoser)]

This looks fine to me. other than I wouldnt just drop CA_ALLOW_CODENAME function.
obviously its of little value, but it allows you to easily just test on something other than LTS.

review: Approve

[lp:~james-page/software-properties/juno-support]

905. By James Page on 2014-07-30

Restore CA_ALLOW_CODENAME

=== modified file 'debian/changelog'
--- debian/changelog	2014-04-30 15:02:44 +0000
+++ debian/changelog	2014-07-30 13:16:51 +0000
@@ -1,3 +1,12 @@
+software-properties (0.92.38) utopic; urgency=medium
+
+  * cloudarchive: Teach cloud-archive: prefix which Ubuntu Cloud Archive's
+    map to which Ubuntu releases, adding support for Juno on 14.04
+    (LP: #1350291).
+  * cloudarchive: Tidy messages to have correct capitalization.
+
+ -- James Page <[e-mail]>  Wed, 30 Jul 2014 12:24:26 +0100
+
 software-properties (0.92.37.1) trusty-proposed; urgency=low
 
   * software-properties-dbus:
 
=== modified file 'softwareproperties/cloudarchive.py'
--- softwareproperties/cloudarchive.py	2013-10-01 03:03:00 +0000
+++ softwareproperties/cloudarchive.py	2014-07-30 13:16:51 +0000
@@ -28,8 +28,13 @@
 
 from softwareproperties.shortcuts import ShortcutException
 
-CODENAME = "precise"
-OS_RELEASES = ('folsom', 'grizzly', 'havana', 'icehouse')
+RELEASE_MAP = {
+    'folsom': 'precise',
+    'grizzly': 'precise',
+    'havana': 'precise',
+    'icehouse': 'precise',
+    'juno': 'trusty',
+}
 MIRROR = "http://ubuntu-cloud.archive.canonical.com/ubuntu"
 UCA = "Ubuntu Cloud Archive"
 WEB_LINK = 'https://wiki.ubuntu.com/ServerTeam/CloudArchive'
@@ -37,7 +42,7 @@
                    'ubuntu-cloud-keyring']
 
 ALIASES = {'tools-updates': 'tools'}
-for _r in OS_RELEASES:
+for _r in RELEASE_MAP:
     ALIASES["%s-updates" % _r] = _r
 
 MAP = {
@@ -49,13 +54,15 @@
         'description': UCA + " for cloud-tools (JuJu and MAAS) [proposed]"}
 }
 
-for _r in OS_RELEASES:
+for _r in RELEASE_MAP:
     MAP[_r] = {
         'sldfmt': '%(codename)s-updates/' + _r,
-        'description': UCA + ' for ' + 'Openstack ' + _r}
+        'description': UCA + ' for ' + 'OpenStack ' + _r.capitalize(),
+        'release': RELEASE_MAP[_r]}
     MAP[_r + "-proposed"] = {
         'sldfmt': '%(codename)s-proposed/' + _r,
-        'description': UCA + ' for ' + 'Openstack %s [proposed]' % _r}
+        'description': UCA + ' for ' + 'OpenStack %s [proposed]' % _r.capitalize(),
+        'release': RELEASE_MAP[_r]}
 
 
 class CloudArchiveShortcutHandler(object):
@@ -73,7 +80,7 @@
 
         name_in = shortcut[len(prefix):]
         caname = ALIASES.get(name_in, name_in)
-        
+
         subs.update({'input_name': name_in})
         if caname not in MAP:
             raise ShortcutException(
@@ -88,10 +95,12 @@
         return self._info
 
     def expand(self, codename):
-        if codename not in (CODENAME, os.environ.get("CA_ALLOW_CODENAME")):
+        if codename not in (MAP[self.caname]['release'],
+                            os.environ.get("CA_ALLOW_CODENAME")):
             raise ShortcutException(
-                _("cloud-archive only supported on %(codename)s")
-                % {'codename': CODENAME})
+                _("cloud-archive for %(os_release)s only supported on %(codename)s")
+                % {'codename': MAP[self.caname]['release'],
+                   'os_release': self.caname.capitalize()})
         dist = MAP[self.caname]['sldfmt'] % {'codename': codename}
         line = ' '.join(('deb', MIRROR, dist, 'main',))
         return (line, _fname_for_caname(self.caname))