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

[Robert Roth]

This branch fixes three issues:
* Adds a symlink to the add-apt-repository manpage under apt-add-repository (LP: #620098)
* Changes the menmonic for the Revert button from R to V to avoid duplicate R mnemonic (Remove and Revert) (LP: #652523)
* Catches URLError and isntructs the user to check the internet connection (LP: #502698)

[Didier Roche-Tolomelli (didrocks)]

All looks good and working fine :) Merging and pushing. Thanks a lot!

review: Approve

[Didier Roche-Tolomelli (didrocks)]

Oh, just one think:
- usr/share/man/man1/add-apt-repository.1.gz usr/share/man/man1/add-apt-repository.1.gz
didn't you mean apt-add… ?

review: Needs Information

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

741. By Robert Roth <robert.roth.off@gmail> on 2012-02-01

Fixed man symlink

[Robert Roth (evfool)]

Yes, that was a mistake, thanks didrocks for pointing that out. I have fixed it and pushed the change.

[Didier Roche-Tolomelli (didrocks)]

Thanks a lot, pushing to trunk then! :)

review: Approve

=== modified file 'add-apt-repository'
--- add-apt-repository	2011-12-06 16:17:06 +0000
+++ add-apt-repository	2012-02-01 11:51:18 +0000
@@ -11,7 +11,7 @@
 from aptsources.sourceslist import SourceEntry
 from optparse import OptionParser
 from gettext import gettext as _
-from urllib2 import HTTPError
+from urllib2 import HTTPError, URLError
 
 def utf8(s):
     """
@@ -118,7 +118,7 @@
 
     # display PPA info (if needed)
     if line.startswith("ppa:") and not options.assume_yes:
-        from softwareproperties.ppa import get_ppa_info_from_lp
+        from softwareproperties.ppa import get_ppa_info_from_lp, LAUNCHPAD_PPA_API
         user, sep, ppa_name = line.split(":")[1].partition("/")
         ppa_name = ppa_name or "ppa"
         try:
@@ -132,6 +132,11 @@
             # exists. If it exists, list down the PPAs
             _maybe_suggest_ppa_name_based_on_user(user)
             sys.exit(1)
+        except URLError:
+            print _("Cannot access PPA (%s) to get PPA information, "
+                    "please check your internet connection.") % \
+                (LAUNCHPAD_PPA_API % (user, ppa_name))
+            sys.exit(1)
         # private PPAs are not supported
         if "private" in ppa_info and ppa_info["private"]:
             print _("Adding private PPAs is not supported currently")

=== modified file 'data/gtkbuilder/main.ui'
--- data/gtkbuilder/main.ui	2012-01-06 19:30:55 +0000
+++ data/gtkbuilder/main.ui	2012-02-01 11:51:18 +0000
@@ -1032,14 +1032,14 @@
             <property name="layout_style">end</property>
             <child>
               <object class="GtkButton" id="button_revert">
-                <property name="label">gtk-revert-to-saved</property>
+                <property name="label">Re_vert</property>
                 <property name="visible">True</property>
                 <property name="sensitive">False</property>
                 <property name="can_focus">True</property>
                 <property name="can_default">True</property>
                 <property name="receives_default">True</property>
                 <property name="use_action_appearance">False</property>
-                <property name="use_stock">True</property>
+                <property name="use_underline">True</property>
                 <signal name="clicked" handler="on_button_revert_clicked" swapped="no"/>
               </object>
               <packing>

=== modified file 'debian/changelog'
--- debian/changelog	2012-01-31 15:51:15 +0000
+++ debian/changelog	2012-02-01 11:51:18 +0000
@@ -8,6 +8,11 @@
   [ Robert Roth ]
   * Updated expand properties to properly expand the bottom component to avoid
     putting empty space between components. LP: #912557
+  * Added symbolic link for add-apt-repository manpage under the 
+    apt-add-repository name, LP: #620098
+  * Changed Revert button mnemonic to avoid collision with Remove, LP: #652523
+  * Handle URLError from ppa pages, instruct the user to check the internet
+    connection (LP: #502698)
 
   [ Marc Deslauriers ]
   * SECURITY UPDATE: incorrect ssl certificate validation (LP: #915210)

=== modified file 'debian/python-software-properties.links'
--- debian/python-software-properties.links	2010-03-26 10:47:58 +0000
+++ debian/python-software-properties.links	2012-02-01 11:51:18 +0000
@@ -1,1 +1,2 @@
-usr/bin/add-apt-repository usr/bin/apt-add-repository
\ No newline at end of file
+usr/bin/add-apt-repository usr/bin/apt-add-repository
+usr/share/man/man1/add-apt-repository.1.gz usr/share/man/man1/apt-add-repository.1.gz