Merge lp:~gary-lasker/software-center/handle-trans-cancel-lp1027209-for-5.2 into lp:software-center/5.2

[Gary Lasker]

This branch is a backport to Precise of the transaction cancellation fix for bug 1027209. Test case is in the bug description.

Many thanks for your review!

[Michael Vogt (mvo)]

Looks fine, thanks.

review: Approve

=== modified file 'softwarecenter/backend/installbackend_impl/aptd.py'
--- softwarecenter/backend/installbackend_impl/aptd.py	2012-07-16 16:43:26 +0000
+++ softwarecenter/backend/installbackend_impl/aptd.py	2012-09-27 03:10:26 +0000
@@ -182,6 +182,10 @@
                     'transaction-stopped': (GObject.SIGNAL_RUN_FIRST,
                                             GObject.TYPE_NONE,
                                             (GObject.TYPE_PYOBJECT,)),
+                    # emits a TransactionFinished object
+                    'transaction-cancelled': (GObject.SIGNAL_RUN_FIRST,
+                                              GObject.TYPE_NONE,
+                                              (GObject.TYPE_PYOBJECT,)),
                     # emits with a pending_transactions list object
                     'transactions-changed': (GObject.SIGNAL_RUN_FIRST,
                                              GObject.TYPE_NONE,
@@ -834,6 +838,14 @@
         self._logger.debug("_on_transaction_finished: %s %s %s" % (
                 trans, enum, trans.meta_data))
 
+        # first check if there has been a cancellation of
+        # the install and fire a transaction-cancelled signal
+        # (see LP: #1027209)
+        if enum == enums.EXIT_CANCELLED:
+            result = TransactionFinishedResult(trans, False)
+            self.emit("transaction-cancelled", result)
+            return
+
         # show error
         if enum == enums.EXIT_FAILED:
             # Handle invalid packages separately
 
=== modified file 'softwarecenter/ui/gtk3/panes/availablepane.py'
--- softwarecenter/ui/gtk3/panes/availablepane.py	2012-07-18 15:22:54 +0000
+++ softwarecenter/ui/gtk3/panes/availablepane.py	2012-09-27 03:10:26 +0000
@@ -225,8 +225,11 @@
             self.on_transactions_changed)
         self.backend.connect("transaction-finished",
             self.on_transaction_complete)
+        self.backend.connect("transaction-cancelled",
+            self.on_transaction_cancelled)
+        # a transaction error is treated the same as a cancellation
         self.backend.connect("transaction-stopped",
-            self.on_transaction_complete)
+            self.on_transaction_cancelled)
 
         # now we are initialized
         self.searchentry.set_sensitive(True)
@@ -394,11 +397,19 @@
             self._update_action_bar()
 
     def on_transaction_complete(self, backend, result):
+        """ handle a transaction that has completed successfully
+        """
         if result.pkgname in self.unity_launcher_transaction_queue:
             transaction_details = (
                 self.unity_launcher_transaction_queue.pop(result.pkgname))
             self._add_application_to_unity_launcher(transaction_details)
 
+    def on_transaction_cancelled(self, backend, result):
+        """ handle a transaction that has been cancelled
+        """
+        if result.pkgname in self.unity_launcher_transaction_queue:
+            self.unity_launcher_transaction_queue.pop(result.pkgname)
+
     def _register_unity_launcher_transaction_started(self, pkgname, appname,
                                                      trans_id, trans_type):
         # at the start of the transaction, we gather details for use later