Merge lp:~rbalint/update-manager/lp-1795898-upgrade-workaround-bionic into lp:~ubuntu-core-dev/update-manager/bionic

[Balint Reczey]

[Julian Andres Klode (juliank)]

review: Approve

=== modified file 'UpdateManager/backend/InstallBackendAptdaemon.py'
--- UpdateManager/backend/InstallBackendAptdaemon.py	2018-10-03 23:15:25 +0000
+++ UpdateManager/backend/InstallBackendAptdaemon.py	2018-10-04 19:43:59 +0000
@@ -241,10 +241,18 @@
         # tell unity to hide the progress again
         self.unity.set_progress(-1)
         is_success = (status == EXIT_SUCCESS)
-        self._action_done(action,
-                          authorized=True, success=is_success,
-                          error_string=error_string, error_desc=error_desc,
-                          trans_failed=trans_failed)
+        try:
+            self._action_done(action,
+                              authorized=True, success=is_success,
+                              error_string=error_string, error_desc=error_desc,
+                              trans_failed=trans_failed)
+        except TypeError:
+            # this module used to be be lazily imported and in older code
+            # trans_failed= is not accepted
+            # TODO: this workaround can be dropped in Ubuntu 20.10
+            self._action_done(action,
+                              authorized=True, success=is_success,
+                              error_string=error_string, error_desc=error_desc)
 
 
 if __name__ == "__main__":

=== modified file 'debian/changelog'
--- debian/changelog	2018-10-03 23:15:25 +0000
+++ debian/changelog	2018-10-04 19:43:59 +0000
@@ -10,7 +10,7 @@
   * Cancel transaction on exit only when Cancel button is active.
     Also ignore exception when cancellation fails. (LP: #1790670)
 
- -- Balint Reczey <[e-mail]>  Wed, 03 Oct 2018 23:06:18 +0200
+ -- Balint Reczey <[e-mail]>  Thu, 04 Oct 2018 21:33:57 +0200
 
 update-manager (1:18.04.11.5) bionic; urgency=medium