Merge lp:~glatzor/software-center/force-bad-quality into lp:software-center

[Sebastian Heinlein]

=== modified file 'softwarecenter/backend/aptd.py'
--- softwarecenter/backend/aptd.py	2011-04-13 20:42:50 +0000
+++ softwarecenter/backend/aptd.py	2011-04-14 12:24:34 +0000
@@ -209,7 +209,7 @@
             yield self.remove(pkgname, appname, iconname, metadata)
 
     @inline_callbacks
-    def install(self, pkgname, appname, iconname, filename=None, addons_install=[], addons_remove=[], metadata=None):
+    def install(self, pkgname, appname, iconname, filename=None, addons_install=[], addons_remove=[], metadata=None, force=False):
         """Install a single package from the archive
            If filename is given a local deb package is installed instead.
         """
@@ -217,8 +217,9 @@
             if filename:
                 # force means on lintian failure
                 trans = yield self.aptd_client.install_file(
-                    filename, force=False, defer=True)
+                    filename, force=force, defer=True)
                 self.emit("transaction-started", pkgname, appname, trans.tid, TRANSACTION_TYPE_INSTALL)
+                yield trans.set_meta_data(sc_filename=filename, defer=True)
             else:
                 install = [pkgname] + addons_install
                 remove = addons_remove
@@ -567,7 +568,8 @@
         except KeyError:
             pass
 
-    def _show_transaction_failed_dialog(self, trans, enum):
+    def _show_transaction_failed_dialog(self, trans, enum,
+                                        alternative_action=None):
         # daemon died are messages that result from broken
         # cancel handling in aptdaemon (LP: #440941)
         # FIXME: this is not a proper fix, just a workaround
@@ -580,6 +582,7 @@
             enums.get_error_description_from_enum(trans.error_code),
             trans.error_details)
         self._logger.error("error in _on_trans_finished '%s'" % msg)
+<<<<<<< TREE
         # show dialog to the user and exit (no need to reopen the cache)
         if not trans.error_code:
             # sometimes aptdaemon doesn't return a value for error_code when the network
@@ -597,15 +600,39 @@
             dialog_primary,
             dialog_secondary,
             dialog_details)
+=======
+        # show dialog to the user and exit (no need to reopen
+        # the cache)
+        return dialogs.error(None,
+                        enums.get_error_string_from_enum(trans.error_code),
+                        enums.get_error_description_from_enum(trans.error_code),
+                        trans.error_details,
+                        alternative_action)
+>>>>>>> MERGE-SOURCE
 
     def _on_trans_finished(self, trans, enum):
         """callback when a aptdaemon transaction finished"""
         self._logger.debug("_on_transaction_finished: %s %s %s" % (
                 trans, enum, trans.meta_data))
 
+
         # show error
         if enum == enums.EXIT_FAILED:
-            if not "sc_add_repo_and_install_ignore_errors" in trans.meta_data:
+            # 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 == gtk.RESPONSE_YES:
+                    # Reinject the transaction
+                    meta_copy = trans.meta_data.copy()
+                    pkgname = meta_copy.pop("sc_pkgname")
+                    appname = meta_copy.pop("sc_appname", None)
+                    iconname = meta_copy.pop("sc_iconname", None)
+                    filename = meta_copy.pop("sc_filename")
+                    self.install(pkgname, appname, iconname, filename, [], [],
+                                 metadata=meta_copy, force=True)
+                    return
+            elif not "sc_add_repo_and_install_ignore_errors" in trans.meta_data:
                 self._show_transaction_failed_dialog(trans, enum)
 
         # send finished signal, use "" here instead of None, because

=== modified file 'softwarecenter/view/dialogs.py'
--- softwarecenter/view/dialogs.py	2011-01-29 05:55:04 +0000
+++ softwarecenter/view/dialogs.py	2011-04-14 12:24:34 +0000
@@ -82,23 +82,27 @@
                   secondary=None, 
                   details=None,
                   buttons=gtk.BUTTONS_OK, 
-                  type=gtk.MESSAGE_INFO):
+                  type=gtk.MESSAGE_INFO,
+                  alternative_action=None):
     """ run a dialog """
     dialog = DetailsMessageDialog(parent=parent, title=title,
                                   primary=primary, secondary=secondary,
                                   details=details, type=type, 
                                   buttons=buttons)
+    if alternative_action:
+        dialog.add_button(alternative_action, gtk.RESPONSE_YES)
     result = dialog.run()
     dialog.destroy()
     return result
 
-def error(parent, primary, secondary, details=None):
+def error(parent, primary, secondary, details=None, alternative_action=None):
     """ show a untitled error dialog """
     return messagedialog(parent=parent,
                          primary=primary, 
                          secondary=secondary,
                          details=details,
-                         type=gtk.MESSAGE_ERROR)
+                         type=gtk.MESSAGE_ERROR,
+                         alternative_action=alternative_action)
 
 
 class FullsizeScreenshotDialog(gtk.Dialog):