Merge lp:~mvo/software-center/misc-fixes into lp:software-center

[Michael Vogt]

Thsis branch adds three fixes:

message:
  softwarecenter/backend/installbackend_impl/aptd.py: when a package can not be authenticated, do not fail (hard) but instead offer to "repair" the situation using a "reload" and try the install again (LP: #876278)

message:
  do not crash in if os.makedirs has a race condition (LP: #956680)

message:
  this fixes the proxy handling with 12.04 as the "enabled" property is deprecated now. it will also not mess with the proxy environment on non-gnome systems (LP: #742564)

[lp:~mvo/software-center/misc-fixes]

2870. By Michael Vogt on 2012-03-16

this fixes the proxy handling with 12.04 as the "enabled" property is deprecated now. it will also not mess with the proxy environment on non-gnome systems (LP: #742564)

[Gary Lasker (gary-lasker)]

Three fixes in one, nice!! Thanks mvo!

review: Approve

=== modified file 'softwarecenter/backend/installbackend_impl/aptd.py'
--- softwarecenter/backend/installbackend_impl/aptd.py	2012-02-14 16:40:42 +0000
+++ softwarecenter/backend/installbackend_impl/aptd.py	2012-03-16 17:27:19 +0000
@@ -766,6 +766,14 @@
                             utf8(alternative_action))
         return res
 
+    def _get_app_and_icon_and_deb_from_trans(self, trans):
+        meta_copy = trans.meta_data.copy()
+        app = Application(meta_copy.pop("sc_appname", None),
+                          meta_copy.pop("sc_pkgname"))
+        iconname = meta_copy.pop("sc_iconname", None)
+        filename = meta_copy.pop("sc_filename", "")
+        return app, iconname, filename, meta_copy
+
     def _on_trans_finished(self, trans, enum):
         """callback when a aptdaemon transaction finished"""
         self._logger.debug("_on_transaction_finished: %s %s %s" % (
@@ -773,21 +781,33 @@
 
         # show error
         if enum == enums.EXIT_FAILED:
-            # Handle invalid packages separately
-            if (trans.error and 
-                trans.error.code == enums.ERROR_INVALID_PACKAGE_FILE):
-                action = _("_Ignore and install")
-                res = self._show_transaction_failed_dialog(trans, enum, action)
-                if res == "yes":
-                    # Reinject the transaction
-                    meta_copy = trans.meta_data.copy()
-                    app = Application(meta_copy.pop("sc_appname", None),
-                                      meta_copy.pop("sc_pkgname"))
-                    iconname = meta_copy.pop("sc_iconname", None)
-                    filename = meta_copy.pop("sc_filename")
-                    self.install(app, iconname, filename, [], [],
-                                 metadata=meta_copy, force=True)
-                    return
+            if trans.error:
+                # Handle invalid packages separately
+                if trans.error.code == enums.ERROR_INVALID_PACKAGE_FILE:
+                    action = _("_Ignore and install")
+                    res = self._show_transaction_failed_dialog(
+                        trans, enum, action)
+                    if res == "yes":
+                        # Reinject the transaction
+                        app, iconname, filename, meta_copy = \
+                            self._get_app_and_icon_and_deb_from_trans(trans)
+                        self.install(app, iconname, filename, [], [],
+                                     metadata=meta_copy, force=True)
+                        return
+                # on unauthenticated errors, try a "repair" using the 
+                # reload functionatlity
+                elif trans.error.code == enums.ERROR_PACKAGE_UNAUTHENTICATED:
+                    action = _("Repair")
+                    res = self._show_transaction_failed_dialog(
+                        trans, enum, action)
+                    if res == "yes":
+                        app, iconname, filename, meta_copy = \
+                            self._get_app_and_icon_and_deb_from_trans(trans)
+                        self.reload()
+                        self.install(app, iconname, filename, [], [],
+                                     metadata=meta_copy)
+                        return
+
             elif not "sc_add_repo_and_install_ignore_errors" in trans.meta_data:
                 self._show_transaction_failed_dialog(trans, enum)
 

=== modified file 'softwarecenter/ui/gtk3/app.py'
--- softwarecenter/ui/gtk3/app.py	2012-03-15 21:19:02 +0000
+++ softwarecenter/ui/gtk3/app.py	2012-03-16 17:27:19 +0000
@@ -476,11 +476,18 @@
         self._gsettings.connect("changed", self._setup_proxy)
 
     def _setup_proxy(self, setting=None, key=None):
-        proxy = get_http_proxy_string_from_gsettings()
-        if proxy:
-            os.environ["http_proxy"] = proxy
-        elif "http_proxy" in os.environ:
-            del os.environ["http_proxy"]
+        try:
+            proxy = get_http_proxy_string_from_gsettings()
+            print "***", proxy
+            if proxy:
+                os.environ["http_proxy"] = proxy
+            else:
+                del os.environ["http_proxy"]
+        except Exception as e:
+            # if no gnome settings are installed, do not mess with
+            # http_proxy
+            LOG.warn("could not get proxy settings '%s'" % e)
+            pass
 
     # callbacks
     def on_realize(self, widget):

=== modified file 'softwarecenter/utils.py'
--- softwarecenter/utils.py	2012-03-15 10:43:13 +0000
+++ softwarecenter/utils.py	2012-03-16 17:27:19 +0000
@@ -244,28 +244,33 @@
 def get_http_proxy_string_from_gsettings():
     """Helper that gets the http proxy from gsettings
 
-    Returns: string with http://auth:pw@proxy:port/ or None
+    May raise a exception if there is no schema for the proxy
+    (e.g. on non-gnome systems)
+
+    Returns: string with http://auth:pw@proxy:port/, None
     """
-    try:
-        # check if this is actually available and usable. if not
-        # well ... it segfaults (thanks pygi)
-        key = "org.gnome.system.proxy.http"
-        if not key in Gio.Settings.list_schemas():
-            return None
-        settings = Gio.Settings.new(key)
-        if settings.get_boolean("enabled"):
-            authentication = ""
-            if settings.get_boolean("use-authentication"):
-                user = settings.get_string("authentication-user")
-                password = settings.get_string("authentication-password")
-                authentication = "%s:%s@" % (user, password)
-            host = settings.get_string("host")
-            port = settings.get_int("port")
-            http_proxy = "http://%s%s:%s/" % (authentication, host, port)
-            if host:
-                return http_proxy
-    except Exception:
-        logging.exception("failed to get proxy from gconf")
+    # check if this is actually available and usable. if not
+    # well ... it segfaults (thanks pygi)
+    key = "org.gnome.system.proxy.http"
+    if not key in Gio.Settings.list_schemas():
+        raise ValueError, "no key '%s'" % key
+    settings = Gio.Settings.new(key)
+    if settings.get_string("host"):
+        authentication = ""
+        if settings.get_boolean("use-authentication"):
+            user = settings.get_string("authentication-user")
+            password = settings.get_string("authentication-password")
+            authentication = "%s:%s@" % (user, password)
+        host = settings.get_string("host")
+        port = settings.get_int("port")
+        # strip leading http (if there is one)
+        if host.startswith("http://"):
+            host = host[len("http://"):]
+        http_proxy = "http://%s%s:%s/" % (authentication, host, port)
+        if host:
+            return http_proxy
+    # no proxy
+    return None
 
 
 def encode_for_xml(unicode_data, encoding="ascii"):

=== modified file 'utils/update-software-center-agent'
--- utils/update-software-center-agent	2011-06-29 11:55:00 +0000
+++ utils/update-software-center-agent	2012-03-16 17:27:19 +0000
@@ -75,7 +75,11 @@
     # setup path
     pathname = XAPIAN_BASE_PATH_SOFTWARE_CENTER_AGENT+".tmp"
     if not os.path.exists(pathname):
-        os.makedirs(pathname)
+        try:
+            os.makedirs(pathname)
+        except OSError as e:
+            logging.warn("Could not create agent dir '%s' (%s)'" % (
+                    pathname, e))
 
     # check that we can write
     if not os.access(pathname, os.W_OK):