Merge lp:~smoser/ubuntu/precise/software-properties/lp1233486 into lp:ubuntu/precise-updates/software-properties

[Scott Moser]

[Brian Murray (brian-murray)]

This was already SRU'ed and uploaded to precise.

review: Disapprove

=== modified file 'add-apt-repository'
--- add-apt-repository	2012-04-25 21:11:57 +0000
+++ add-apt-repository	2013-10-08 16:10:27 +0000
@@ -5,10 +5,12 @@
 import gettext
 import locale
 
-from softwareproperties.SoftwareProperties import SoftwareProperties
-from softwareproperties.ppa import DEFAULT_KEYSERVER, expand_ppa_line
+from softwareproperties.SoftwareProperties import SoftwareProperties, expand_shortcut_line
+from softwareproperties.ppa import DEFAULT_KEYSERVER
+from softwareproperties import cloudarchive
 from softwareproperties import lp_application_name
 from aptsources.sourceslist import SourceEntry
+from aptsources.distro import get_distro
 from optparse import OptionParser
 from gettext import gettext as _
 from urllib2 import HTTPError, URLError
@@ -117,6 +119,7 @@
     line = args[0]
 
     # display PPA info (if needed)
+    prompt_info = {}
     if line.startswith("ppa:") and not options.assume_yes:
         from softwareproperties.ppa import get_ppa_info_from_lp, LAUNCHPAD_PPA_API
         user, sep, ppa_name = line.split(":")[1].partition("/")
@@ -142,12 +145,34 @@
             print _("Adding private PPAs is not supported currently")
             sys.exit(1)
         
+        prompt_info["description"] = ppa_info["description"] or ""
+        prompt_info["web_link"] = ppa_info["web_link"]
+        prompt_info["remove"] = _("You are about to remove the following PPA from your system:")
+        prompt_info["add"] = _("You are about to add the following PPA to your system:")
+       
+    elif line.startswith("cloud-archive:"):
+        try:
+            # we check 'expand' for the current codename here. so as to know
+            # that later calls will not raise exception.
+            handler = cloudarchive.shortcut_handler(line)
+            handler.expand(codename=get_distro().codename)
+        except cloudarchive.ShortcutException as e:
+            print e
+            sys.exit(1)
+
+        if not options.assume_yes:
+            prompt_info.update(handler.info())
+            prompt_info["remove"] = _("You are about to remove the following from your system:")
+            prompt_info["add"] = _("You are about to add the following to your system:")
+
+    if prompt_info:
         if options.remove:
-            print _("You are about to remove the following PPA from your system:")
+            print prompt_info["remove"]
         else:
-            print _("You are about to add the following PPA to your system:")
-        print " %s" % utf8(ppa_info["description"] or "")
-        print _(" More info: %s") % ppa_info["web_link"]
+            print prompt_info["add"]
+
+        print " %s" % utf8(prompt_info["description"] or "")
+        print _(" More info: %s") % prompt_info["web_link"]
         if (sys.stdin.isatty() and
             not "FORCE_ADD_APT_REPOSITORY" in os.environ):
             if options.remove:
@@ -159,7 +184,7 @@
     # add it
     sp = SoftwareProperties(options=options)
     if options.remove:
-        (line, file) = expand_ppa_line(line.strip(), sp.distro.codename)
+        (line, file) = expand_shortcut_line(line.strip(), sp.distro.codename)
         deb_line = sp.expand_http_line(line)
         debsrc_line = 'deb-src' + deb_line[3:]
         deb_entry = SourceEntry(deb_line, file)

=== modified file 'debian/changelog'
--- debian/changelog	2013-09-13 10:07:44 +0000
+++ debian/changelog	2013-10-08 16:10:27 +0000
@@ -1,3 +1,10 @@
+software-properties (0.82.7.6) UNRELEASED; urgency=low
+
+  * support adding cloud-archive repositories using syntax like
+    cloud-archive:havana from add-apt-repository (LP: #1233486)
+
+ -- Scott Moser <[e-mail]>  Sat, 05 Oct 2013 20:55:24 -0400
+
 software-properties (0.82.7.5) precise-security; urgency=low
 
   * SECURITY UPDATE: possible privilege escalation via policykit UID lookup

=== modified file 'softwareproperties/SoftwareProperties.py'
--- softwareproperties/SoftwareProperties.py	2012-04-25 21:11:57 +0000
+++ softwareproperties/SoftwareProperties.py	2013-10-08 16:10:27 +0000
@@ -51,6 +51,7 @@
 from AptAuth import AptAuth
 from aptsources.sourceslist import SourcesList, SourceEntry
 from ppa import AddPPASigningKeyThread, expand_ppa_line
+from cloudarchive import shortcut_handler as ca_shortcut_handler
 
 class SoftwareProperties(object):
 
@@ -693,14 +694,23 @@
     Add a source with the given apt line and auto-add
     signing key if we have it in the whitelist
     """
-    (deb_line, file) = expand_ppa_line(line.strip(), self.distro.codename)
+    (deb_line, file) = expand_shortcut_line(line.strip(), self.distro.codename)
     deb_line = self.expand_http_line(deb_line)
     debsrc_line = 'deb-src' + deb_line[3:]
     new_deb_entry = SourceEntry(deb_line, file)
     new_debsrc_entry = SourceEntry(debsrc_line, file)
     if new_deb_entry.invalid or new_debsrc_entry.invalid:
       return False
-    worker = self.check_and_add_key_for_whitelisted_channels(deb_line)
+
+    if line.startswith("cloud-archive:"):
+        # in trunk, we modified check_and_add_key_for_whitelisted_channels to
+        # take the line itself.  but this is that functions only caller
+        # so it should be safe and less invasive to do this check here instead.
+        ca_handler = ca_shortcut_handler(line.strip())
+        worker = threading.Thread(target=ca_handler.add_key)
+        worker.start()
+    else:
+        worker = self.check_and_add_key_for_whitelisted_channels(deb_line)
     self.sourceslist.add(new_deb_entry.type,
                          new_deb_entry.uri,
                          new_deb_entry.dist,
@@ -774,6 +784,14 @@
       return False
 
 
+def expand_shortcut_line(abrev, codename):
+    if abrev.startswith("cloud-archive:"):
+        handler = ca_shortcut_handler(abrev)
+        return handler.expand(codename)
+
+    return expand_ppa_line(abrev, distro_codename=codename)
+
+
 if __name__ == "__main__":
   sp = SoftwareProperties()
   print sp.get_release_upgrades_policy()

=== added file 'softwareproperties/cloudarchive.py'
--- softwareproperties/cloudarchive.py	1970-01-01 00:00:00 +0000
+++ softwareproperties/cloudarchive.py	2013-10-08 16:10:27 +0000
@@ -0,0 +1,125 @@
+#  software-properties cloud-archive support
+#
+#  Copyright (c) 2013 Canonical Ltd.
+#
+#  Author: Scott Moser <[e-mail]>
+#
+#  This program is free software; you can redistribute it and/or
+#  modify it under the terms of the GNU General Public License as
+#  published by the Free Software Foundation; either version 2 of the
+#  License, or (at your option) any later version.
+#
+#  This program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with this program; if not, write to the Free Software
+#  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
+#  USA
+
+from __future__ import print_function
+
+import apt_pkg
+import os
+import subprocess
+from gettext import gettext as _
+
+CODENAME = "precise"
+OS_RELEASES = ('folsom', 'grizzly', 'havana', 'icehouse')
+MIRROR = "http://ubuntu-cloud.archive.canonical.com/ubuntu"
+UCA = "Ubuntu Cloud Archive"
+WEB_LINK = 'https://wiki.ubuntu.com/ServerTeam/CloudArchive'
+APT_INSTALL_KEY = ['apt-get', '--quiet', '--assume-yes', 'install',
+                   'ubuntu-cloud-keyring']
+
+ALIASES = {'tools-updates': 'tools'}
+for _r in OS_RELEASES:
+    ALIASES["%s-updates" % _r] = _r
+
+MAP = {
+    'tools': {
+        'sldfmt': '%(codename)s-updates/cloud-tools',
+        'description': UCA + " for cloud-tools (JuJu and MAAS)"},
+    'tools-proposed': {
+        'sldfmt': '%(codename)s-proposed/cloud-tools',
+        'description': UCA + " for cloud-tools (JuJu and MAAS) [proposed]"}
+}
+
+for _r in OS_RELEASES:
+    MAP[_r] = {
+        'sldfmt': '%(codename)s-updates/' + _r,
+        'description': UCA + ' for ' + 'Openstack ' + _r}
+    MAP[_r + "-proposed"] = {
+        'sldfmt': '%(codename)s-proposed/' + _r,
+        'description': UCA + ' for ' + 'Openstack %s [proposed]' % _r}
+
+
+class CloudArchiveShortcutHandler(object):
+    def __init__(self, shortcut):
+        self.shortcut = shortcut
+
+        prefix = "cloud-archive:"
+
+        subs = {'shortcut': shortcut, 'prefix': prefix,
+                'ca_names': sorted(MAP.keys())}
+        if not shortcut.startswith(prefix):
+            raise ValueError(
+                _("shortcut '%(shortcut)s' did not start with '%(prefix)s'")
+                % subs)
+
+        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(
+                _("'%(input_name)s': not a valid cloud-archive name.\n"
+                  "Must be one of %(ca_names)s") % subs)
+
+        self.caname = caname
+        self._info = MAP[caname].copy()
+        self._info['web_link' ] = WEB_LINK
+
+    def info(self):
+        return self._info
+
+    def expand(self, codename):
+        if codename not in (CODENAME, os.environ.get("CA_ALLOW_CODENAME")):
+            raise ShortcutException(
+                _("cloud-archive only supported on %(codename)s")
+                % {'codename': CODENAME})
+        dist = MAP[self.caname]['sldfmt'] % {'codename': codename}
+        line = ' '.join(('deb', MIRROR, dist, 'main',))
+        return (line, _fname_for_caname(self.caname))
+
+    def should_confirm(self):
+        return True
+
+    def add_key(self, keyserver=None):
+        env = os.environ.copy()
+        env['DEBIAN_FRONTEND'] = 'noninteractive'
+        try:
+            subprocess.check_call(args=APT_INSTALL_KEY, env=env)
+        except subprocess.CalledProcessError as e:
+            return False
+        return True
+
+
+def _fname_for_caname(caname):
+    # caname is an entry in MAP ('tools' or 'tools-proposed')
+    return os.path.join(
+        apt_pkg.config.find_dir("Dir::Etc::sourceparts"),
+        'cloudarchive-%s.list' % caname)
+
+
+def shortcut_handler(shortcut):
+    try:
+        return CloudArchiveShortcutHandler(shortcut)
+    except ValueError:
+        return None
+
+
+def ShortcutException(Exception):
+    pass