Merge lp:~rbalint/update-manager/fix-blank-package-list into lp:update-manager

[Balint Reczey]

[Julian Andres Klode (juliank)]

I have no idea what this does.

review: Abstain

[Julian Andres Klode (juliank)]

Seems OK

review: Approve

=== modified file 'UpdateManager/Core/UpdateList.py'
--- UpdateManager/Core/UpdateList.py	2018-03-21 17:41:10 +0000
+++ UpdateManager/Core/UpdateList.py	2018-09-27 11:02:38 +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.