Merge lp:~mac9416/software-properties/illegalcharfix into lp:software-properties

[mac9416]

This fixes Bug #579669 which points out that add-apt-repository will create a sources.list.d file with illegal characters (as defined by the sources.list man page) if there are illegal characters in a PPA name.

[Michael Vogt (mvo)]

A slightly modified version got merged into trunk

=== modified file 'add-apt-repository'
--- add-apt-repository	2010-03-26 10:18:47 +0000
+++ add-apt-repository	2010-07-19 20:31:45 +0000
@@ -6,6 +6,8 @@
 import locale
 
 from softwareproperties.SoftwareProperties import SoftwareProperties
+from softwareproperties.ppa import expand_ppa_line
+from aptsources.sourceslist import SourceEntry
 from optparse import OptionParser
 from gettext import gettext as _
 
@@ -24,6 +26,9 @@
     parser = OptionParser(usage)
     # FIXME: provide a --sources-list-file= option that 
     #        puts the line into a specific file in sources.list.d
+    parser.add_option("-r", "--remove", action="store_true",
+        dest="remove", default=False,
+        help="remove repository from sources.list.d directory")
     (options, args) = parser.parse_args()
 
     if os.geteuid() != 0:
@@ -37,9 +42,17 @@
     # force new ppa file to be 644 (LP: #399709)
     os.umask(0022)
 
-    sp = SoftwareProperties(options)	
+    sp = SoftwareProperties()	
     line = args[0]
-    if not sp.add_source_from_line(line):
-        print _("Error: '%s' invalid" % line)
-        sys.exit(1)
-    sp.sourceslist.save()
+    if options.remove:
+        (line, file) = expand_ppa_line(line.strip(), sp.distro.codename)
+        source_entry = SourceEntry(line, file)
+        try:
+            sp.remove_source(source_entry)
+        except ValueError:
+            print _("Error: '%s' doesn't exists in a sourcelist file" % line)
+    else:
+        if not sp.add_source_from_line(line):
+            print _("Error: '%s' invalid" % line)
+            sys.exit(1)
+        sp.sourceslist.save()
 
=== modified file 'softwareproperties/ppa.py'
--- softwareproperties/ppa.py	2010-04-14 07:04:11 +0000
+++ softwareproperties/ppa.py	2010-07-19 20:31:45 +0000
@@ -21,6 +21,7 @@
 
 from threading import Thread
 from urllib2 import urlopen, Request, URLError
+import urllib
 import re
 import subprocess
 import apt_pkg
@@ -43,8 +44,11 @@
     sourceslistd = apt_pkg.Config.FindDir("Dir::Etc::sourceparts")
     line = "deb http://ppa.launchpad.net/%s/%s/ubuntu %s main" % (
         ppa_owner, ppa_name, distro_codename)
+
+    encode = lambda s: urllib.quote(s,'').replace('-','%2D').replace('%','-')
+
     file = "%s/%s-%s-%s.list" % (
-        sourceslistd, ppa_owner, ppa_name, distro_codename)
+        sourceslistd, encode(ppa_owner), encode(ppa_name), encode(distro_codename))
     return (line, file)