Merge lp:~evfool/software-properties/lp997371 into lp:software-properties

[Robert Roth]

This branch enhances add-apt-repository with the power to enable/disable distribution components (it almost has super-cow powers). As requested in my previous merge, instead of adding a new tool for enable/disable repo, this has been added into the add-apt-repository tool.

=== modified file 'add-apt-repository'
--- add-apt-repository	2012-06-12 09:54:46 +0000
+++ add-apt-repository	2012-06-14 19:48:20 +0000
@@ -4,11 +4,14 @@
 import sys
 import gettext
 import locale
+import re
 
 from softwareproperties.SoftwareProperties import SoftwareProperties
 from softwareproperties.ppa import DEFAULT_KEYSERVER, expand_ppa_line
 from softwareproperties import lp_application_name
+import aptsources
 from aptsources.sourceslist import SourceEntry
+from aptsources.distro import *
 from optparse import OptionParser
 from gettext import gettext as _
 from urllib2 import HTTPError, URLError
@@ -75,7 +78,7 @@
     # correctly, see http://bugs.python.org/issue4391
     # Shoudl be resolved by Python3
     enc = locale.getpreferredencoding()
-    usage = """Usage: %prog <sourceline>
+    usage = """Usage: %prog [options] <sourceline>
 
 %prog is a script for adding apt sources.list entries. 
 It can be used to add any repository and also provides a shorthand 
@@ -86,6 +89,7 @@
   a complete apt line in quotes, 
   a repo url and areas in quotes (areas defaults to 'main')
   a PPA shortcut.
+  a distro component
 
   Examples:
     apt-add-repository 'deb http://myserver/path/to/repo stable myrepo'
@@ -93,6 +97,7 @@
     apt-add-repository 'https://packages.medibuntu.org free non-free'
     apt-add-repository http://extras.ubuntu.com/ubuntu 
     apt-add-repository ppa:user/repository
+    apt-add-repository multiverse
 
 If --remove is given the tool will remove the given sourceline from your
 sources.list
@@ -170,6 +175,27 @@
 
     # add it
     sp = SoftwareProperties(options=options)
+    distro = aptsources.distro.get_distro()
+    distro.get_sources(sp.sourceslist)
+    components = [comp.name for comp in distro.source_template.components]
+    if line in components:
+        if options.remove:
+            if line in distro.enabled_comps:
+                distro.disable_component(line)
+                print _("'%s' distribution component disabled for all sources.")%line
+            else:
+                print _("Error: '%s' distribution component is not enabled, can not disable it.")%line
+                sys.exit(1)
+        else:
+            if line not in distro.enabled_comps:
+                distro.enable_component(line)
+                print _("'%s' distribution component enabled for all sources.")%line
+            else:
+                print _("Error: '%s' distribution component is already enabled.")%line
+                sys.exit(1)
+        sp.sourceslist.save()
+        sys.exit(0)
+
     if options.remove:
         (line, file) = expand_ppa_line(line.strip(), sp.distro.codename)
         deb_line = sp.expand_http_line(line)

=== modified file 'debian/manpages/add-apt-repository.1'
--- debian/manpages/add-apt-repository.1	2011-11-21 15:33:26 +0000
+++ debian/manpages/add-apt-repository.1	2012-06-14 19:48:20 +0000
@@ -28,8 +28,8 @@
 
 .SH REPOSITORY STRING
 \fIREPOSITORY\fR can be either a line that can be added directly to
-sources.list(5), or in the form ppa:<user>/<ppa-name> for adding Personal
-Package Archives.
+sources.list(5), in the form ppa:<user>/<ppa-name> for adding Personal
+Package Archives, or a distribution component to enable.
 
 In the first form, \fIREPOSITORY\fR will just be appended to 
 /etc/apt/sources.list.
@@ -40,6 +40,9 @@
 The GPG public key of the newly added PPA will also be downloaded and
 added to apt's keyring.
 
+In the third form, the given distribution component will be enabled for all
+sources.
+
 .SH SEE ALSO
 \fBsources.list\fR(5)