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

[Robert Roth]

This branch contains the following minor fixes, one commit/bug
* Fix warnings logged to terminal about inexistent handlers by checking if the handlers exist
* Change geeky authentication text displayed on policykit auth dialog to the one suggested by mpt (bug #828285 )
* Reset the popcon checkbox value if changed, but auth failed (bug #874759)
* Apt-add-repository --remove changed to also remove the debsrc line (bug #838507)
* Apt-add-repository PPA warning changed to warn you about add/removal depending on what you really want to do.
* Update the manpage of apt-add-repository with the available options. (bug #697546)
* Reset the text on the mirror testing dialog after closing/canceling it (bug #875679)
* Unicode encode PPA description and displaynam to avoid UnicodeDecodeErrors (bug #827355)
* Do not expand the server combobox (bug #875131)

[lp:~evfool/software-properties/fixes]

729. By Robert Roth on 2011-10-15

Updated add-apt-repository manpage with new options

730. By Robert Roth on 2011-10-18

Reset dialog text after closing or canceling the test dialog (LP: #875679)

731. By Robert Roth on 2011-10-18

Fix UnicodeDecodeErrors caused by PPA displayname or description (LP: #827355)

732. By Robert Roth on 2011-10-18

Do not expand the Download From combo vertically (LP: #875131)

[Michael Vogt (mvo)]

Thanks a *bunch*, that is excellent work!

review: Approve

[Michael Vogt (mvo)]

Btw, some of this we should consider to backport to oneiric, actually everything that does not change strings. What do you think?

[Robert Roth (evfool)]

Yes, it's possible. Revisions 724, 726, 727, 730, 731, 732 are backportable, those do not contain any man page or string changes.

=== modified file 'add-apt-repository'
--- add-apt-repository	2011-08-19 00:12:32 +0000
+++ add-apt-repository	2011-10-18 19:47:25 +0000
@@ -11,6 +11,17 @@
 from optparse import OptionParser
 from gettext import gettext as _
 
+def utf8(s):
+    """
+    Takes a string or unicode object and returns a utf-8 encoded
+    string, errors are ignored
+    """
+    if s is None:
+        return None
+    if isinstance(s, unicode):
+        return s.encode("utf-8", "ignore")
+    return unicode(s, "utf8", "ignore").encode("utf8")
+
 if __name__ == "__main__":
     try:
         locale.setlocale(locale.LC_ALL, "")
@@ -75,23 +86,37 @@
         user, sep, ppa_name = line.split(":")[1].partition("/")
         ppa_name = ppa_name or "ppa"
         ppa_info = get_ppa_info_from_lp(user, ppa_name)
-        print _("You are about to add the following PPA to your system:")
-        print " %s" % ppa_info["displayname"]
-        print " %s" % (ppa_info["description"] or "")
+        if options.remove:
+            print _("You are about to remove the following PPA from your system:")
+        else:
+            print _("You are about to add the following PPA to your system:")
+        print " %s" % utf8(ppa_info["displayname"])
+        print " %s" % (utf8(ppa_info["description"]) or "")
         print _(" More info: %s") % ppa_info["web_link"]
         if sys.stdin.isatty():
-            print _("Press [ENTER] to continue or ctrl-c to cancel adding it")
+            if options.remove:
+                print _("Press [ENTER] to continue or ctrl-c to cancel removing it")
+            else:
+                print _("Press [ENTER] to continue or ctrl-c to cancel adding it")
             sys.stdin.readline()
 
     # add it
     sp = SoftwareProperties(options=options)
     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 exist in a sourcelist file" % line)
+        deb_line = sp.expand_http_line(line)
+        debsrc_line = 'deb-src' + deb_line[3:]
+        deb_entry = SourceEntry(deb_line, file)
+        debsrc_entry = SourceEntry(debsrc_line, file)
+        try:
+            sp.remove_source(deb_entry)
+        except ValueError:
+            print _("Error: '%s' doesn't exist in a sourcelist file" % deb_line)
+        try:
+            sp.remove_source(debsrc_entry)
+        except ValueError:
+            print _("Error: '%s' doesn't exist in a sourcelist file" % debsrc_line)
+
     else:
         if not sp.add_source_from_line(line):
             print _("Error: '%s' invalid" % line)

=== modified file 'data/com.ubuntu.softwareproperties.policy.in'
--- data/com.ubuntu.softwareproperties.policy.in	2011-07-11 10:48:09 +0000
+++ data/com.ubuntu.softwareproperties.policy.in	2011-10-18 19:47:25 +0000
@@ -10,7 +10,7 @@
 
   <action id="com.ubuntu.softwareproperties.applychanges">
     <_description>Write Configuration</_description>
-    <_message>Authentication to write a new APT configuration</_message>
+    <_message>To change software repository settings, you need to authenticate.</_message>
     <defaults>
       <allow_any>auth_admin</allow_any>
       <allow_inactive>auth_admin</allow_inactive>

=== modified file 'data/gtkbuilder/main.ui'
--- data/gtkbuilder/main.ui	2011-07-18 12:43:58 +0000
+++ data/gtkbuilder/main.ui	2011-10-18 19:47:25 +0000
@@ -207,7 +207,7 @@
                                   </object>
                                   <packing>
                                     <property name="expand">True</property>
-                                    <property name="fill">True</property>
+                                    <property name="fill">False</property>
                                     <property name="position">1</property>
                                   </packing>
                                 </child>

=== modified file 'debian/manpages/add-apt-repository.1'
--- debian/manpages/add-apt-repository.1	2010-03-26 12:26:40 +0000
+++ debian/manpages/add-apt-repository.1	2011-10-18 19:47:25 +0000
@@ -1,25 +1,37 @@
 .TH "add-apt-repository" "1"
 .SH NAME
-add-apt-repository \- Adds a repository into the /etc/apt/sources.list or
-/etc/apt/sources.list.d
+add-apt-repository \- Adds a repository into the 
+/etc/apt/sources.list or /etc/apt/sources.list.d 
+or removes an existing one
 .SH SYNOPSIS
 .B add-apt-repository \fI[OPTIONS]\fR \fIREPOSITORY\fR
 .SH DESCRIPTION
 .B add-apt-repository
 is a script which adds an external APT repository to either
-/etc/apt/sources.list or a file in /etc/apt/sources.list.d/.
-
-Currently the only option supported by add-apt-repository is as follows:
-
-.B -h,--help
+/etc/apt/sources.list or a file in /etc/apt/sources.list.d/ 
+or removes an already existing repository.
+
+The options supported by add-apt-repository are:
+
+.B -h, --help
 Show help message and exit
 
+.B -r, --remove
+Remove the specified repository
+
+.B -y, --yes
+Assume yes to all queries
+
+.B -k, --keyserver
+Use a custom keyserver URL instead of the default
+
+
 .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.
 
-In the first form, \fIREPOSITORY\fR will just be appended to
+In the first form, \fIREPOSITORY\fR will just be appended to 
 /etc/apt/sources.list.
 
 In the second form, ppa:<user>/<ppa-name> will be expanded to the full deb line

=== modified file 'softwareproperties/gtk/DialogMirror.py'
--- softwareproperties/gtk/DialogMirror.py	2011-08-17 05:19:00 +0000
+++ softwareproperties/gtk/DialogMirror.py	2011-10-18 19:47:25 +0000
@@ -319,8 +319,8 @@
                                    (test.progress[0], test.progress[1]))
             self.progress.set_fraction(test.progress[2])
             progress_update.clear()
-
     self.dialog_test.hide()
+    self.label_test.set_label("")
     # Select the mirror in the list or show an error dialog
     if test.best != None:
         self.model_sort.foreach(self.select_mirror, test.best)

=== modified file 'softwareproperties/gtk/SoftwarePropertiesGtk.py'
--- softwareproperties/gtk/SoftwarePropertiesGtk.py	2011-08-17 05:19:00 +0000
+++ softwareproperties/gtk/SoftwarePropertiesGtk.py	2011-10-18 19:47:25 +0000
@@ -333,11 +333,13 @@
 
   def block_handlers(self):
     for (widget, handler) in self.handlers:
-        widget.handler_block(handler)
+        if widget.handler_is_connected(handler):
+            widget.handler_block(handler)
  
   def unblock_handlers(self):
     for (widget, handler) in self.handlers:
-        widget.handler_unblock(handler)
+        if widget.handler_is_connected(handler):
+            widget.handler_unblock(handler)
 
   def show_distro(self):
     """Fill the distro user interface with life"""
@@ -727,6 +729,7 @@
   def on_auth_failed(self):
     """ send when the authentication failed """
     # reread the current config
+    self.init_popcon()
     self.on_sources_list_modified()
     self.on_config_modified()
     self.on_keys_modified()