Merge lp:~rbalint/update-manager/lp-1795898-lp-1790670-lp-1072136-bionic into lp:~ubuntu-core-dev/update-manager/bionic

[Balint Reczey]

[Julian Andres Klode (juliank)]

review: Approve

=== modified file 'UpdateManager/Core/UpdateList.py'
--- UpdateManager/Core/UpdateList.py	2018-03-21 17:41:10 +0000
+++ UpdateManager/Core/UpdateList.py	2018-10-03 23:24:21 +0000
@@ -499,7 +499,6 @@
                 if not is_security_update:
                     if self._is_ignored_phased_update(pkg):
                         self.ignored_phased_updates.append(pkg)
-                        pkg.mark_keep()
                         continue
 
                 if is_security_update:
@@ -517,7 +516,13 @@
                  cache.versioned_kernel_pkgs_regexp.match(pkg.name) and
                  not cache.running_kernel_pkgs_regexp.match(pkg.name))):
                 kernel_autoremove_pkgs.append(pkg)
-                pkg.mark_delete()
+
+        # perform operations after the loop to not skip packages which
+        # changed state due to the resolver
+        for pkg in kernel_autoremove_pkgs:
+            pkg.mark_delete()
+        for pkg in self.ignored_phased_updates:
+            pkg.mark_keep()
 
         if security_pkgs or upgrade_pkgs:
             # There's updates available. Initiate the desktop file cache.
 
=== modified file 'UpdateManager/backend/InstallBackendAptdaemon.py'
--- UpdateManager/backend/InstallBackendAptdaemon.py	2018-09-17 15:16:31 +0000
+++ UpdateManager/backend/InstallBackendAptdaemon.py	2018-10-03 23:24:21 +0000
@@ -49,8 +49,13 @@
         self.trans_failed_msg = None
 
     def close(self):
-        if self.button_cancel:
-            self.button_cancel.clicked()
+        if self.button_cancel and self.button_cancel.get_sensitive():
+            try:
+                self.button_cancel.clicked()
+            except Exception:
+                # there is not much left to do if the transaction can't be
+                # canceled
+                pass
             return True
         else:
             return False
 
=== modified file 'UpdateManager/backend/__init__.py'
--- UpdateManager/backend/__init__.py	2018-09-17 15:16:31 +0000
+++ UpdateManager/backend/__init__.py	2018-10-03 23:24:21 +0000
@@ -95,6 +95,25 @@
                 self.window_main.start_available(is_cancelled_update)
 
 
+# try aptdaemon
+if os.path.exists("/usr/sbin/aptd") \
+   and "UPDATE_MANAGER_FORCE_BACKEND_SYNAPTIC" not in os.environ:
+    # check if the gtkwidgets are installed as well
+    try:
+        from .InstallBackendAptdaemon import InstallBackendAptdaemon
+    except ImportError:
+        import logging
+        logging.exception("importing aptdaemon")
+# try synaptic
+if os.path.exists("/usr/sbin/synaptic") \
+   and "UPDATE_MANAGER_FORCE_BACKEND_APTDAEMON" not in os.environ:
+    try:
+        from .InstallBackendSynaptic import InstallBackendSynaptic
+    except ImportError:
+        import logging
+        logging.exception("importing synaptic")
+
+
 def get_backend(*args, **kwargs):
     """Select and return a package manager backend."""
     # try aptdaemon
@@ -102,16 +121,17 @@
             "UPDATE_MANAGER_FORCE_BACKEND_SYNAPTIC" not in os.environ):
         # check if the gtkwidgets are installed as well
         try:
-            from .InstallBackendAptdaemon import InstallBackendAptdaemon
             return InstallBackendAptdaemon(*args, **kwargs)
-        except ImportError:
+        except NameError:
             import logging
-            logging.exception("importing aptdaemon")
+            logging.exception("using aptdaemon failed")
     # try synaptic
-    if (os.path.exists("/usr/sbin/synaptic") and
-            "UPDATE_MANAGER_FORCE_BACKEND_APTDAEMON" not in os.environ):
-        from .InstallBackendSynaptic import InstallBackendSynaptic
-        return InstallBackendSynaptic(*args, **kwargs)
+    if (os.path.exists("/usr/sbin/synaptic")
+            and "UPDATE_MANAGER_FORCE_BACKEND_APTDAEMON" not in os.environ):
+        try:
+            return InstallBackendSynaptic(*args, **kwargs)
+        except NameError:
+            pass
     # nothing found, raise
     raise Exception("No working backend found, please try installing "
-                    "synaptic or aptdaemon")
+                    "aptdaemon or synaptic")
 
=== modified file 'debian/changelog'
--- debian/changelog	2018-09-21 23:45:25 +0000
+++ debian/changelog	2018-10-03 23:24:21 +0000
@@ -1,3 +1,17 @@
+update-manager (1:18.04.11.6) bionic; urgency=medium
+
+  * Keep or delete packages after looping over all of them.
+    This prevents the resolver from changing the packages in the loop resulting
+    in not keeping some phased packages back from being upgraded. (LP: #1072136)
+  * Stop lazy import of InstallBackends.
+    Lazy imports made update-manager crash when an update-manager
+    update changed the backend API and an updated incompatible backend
+    was loaded to the not updated running update-manager process. (LP: #1795898)
+  * 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
+
 update-manager (1:18.04.11.5) bionic; urgency=medium
 
   * Print transaction error and let the user try again applying updates
 
=== added file 'tests/test_backend_error.py'
--- tests/test_backend_error.py	1970-01-01 00:00:00 +0000
+++ tests/test_backend_error.py	2018-10-03 23:24:21 +0000
@@ -0,0 +1,45 @@
+#!/usr/bin/python3
+# -*- Mode: Python; indent-tabs-mode: nil; tab-width: 4; coding: utf-8 -*-
+
+import logging
+import mock
+import sys
+import unittest
+from gettext import gettext as _
+from mock import patch
+
+from UpdateManager.Dialogs import NoUpdatesDialog
+from UpdateManager.UpdateManager import UpdateManager
+from UpdateManager.UpdatesAvailable import UpdatesAvailable
+
+import os
+CURDIR = os.path.dirname(os.path.abspath(__file__))
+
+
+class TestBackendError(unittest.TestCase):
+
+    def setUp(self):
+        os.environ['UPDATE_MANAGER_FORCE_BACKEND_APTDAEMON'] = '1'
+
+        def clear_environ():
+            del os.environ['UPDATE_MANAGER_FORCE_BACKEND_APTDAEMON']
+
+        self.addCleanup(clear_environ)
+
+    @patch('UpdateManager.backend.InstallBackendAptdaemon.update')
+    def test_backend_error(self, update):
+        main = mock.MagicMock()
+        main.datadir = os.path.join(CURDIR, '..', 'data')
+
+        from UpdateManager.backend import (InstallBackend, get_backend)
+        update_backend = get_backend(main, InstallBackend.ACTION_UPDATE)
+        update.side_effect = lambda: update_backend._action_done(
+            InstallBackend.ACTION_UPDATE, True, False, "string", "desc")
+        update_backend.start()
+        main.start_error.assert_called_once_with(True, "string", "desc")
+
+
+if __name__ == '__main__':
+    if len(sys.argv) > 1 and sys.argv[1] == "-v":
+        logging.basicConfig(level=logging.DEBUG)
+    unittest.main()
 
=== modified file 'tests/test_pep8.py'
--- tests/test_pep8.py	2017-08-07 20:54:58 +0000
+++ tests/test_pep8.py	2018-10-03 23:24:21 +0000
@@ -6,7 +6,7 @@
 import unittest
 
 # pep8 is overdoing it a bit IMO
-IGNORE_PEP8 = "E265,E402"
+IGNORE_PEP8 = "E265,E402,W503"
 IGNORE_FILES = (
 )
 
 
=== modified file 'tests/test_update_error.py'
--- tests/test_update_error.py	2017-08-07 19:42:06 +0000
+++ tests/test_update_error.py	2018-10-03 23:24:21 +0000
@@ -44,29 +44,6 @@
                          _("Some software couldn’t be checked for updates."))
 
 
-class TestBackendError(unittest.TestCase):
-
-    def setUp(self):
-        os.environ['UPDATE_MANAGER_FORCE_BACKEND_APTDAEMON'] = '1'
-
-        def clear_environ():
-            del os.environ['UPDATE_MANAGER_FORCE_BACKEND_APTDAEMON']
-
-        self.addCleanup(clear_environ)
-
-    @patch('UpdateManager.backend.InstallBackendAptdaemon.'
-           'InstallBackendAptdaemon.update')
-    def test_backend_error(self, update):
-        main = mock.MagicMock()
-        main.datadir = os.path.join(CURDIR, '..', 'data')
-
-        update_backend = get_backend(main, InstallBackend.ACTION_UPDATE)
-        update.side_effect = lambda: update_backend._action_done(
-            InstallBackend.ACTION_UPDATE, True, False, "string", "desc")
-        update_backend.start()
-        main.start_error.assert_called_once_with(True, "string", "desc")
-
-
 if __name__ == '__main__':
     if len(sys.argv) > 1 and sys.argv[1] == "-v":
         logging.basicConfig(level=logging.DEBUG)