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

Proposed by Balint Reczey on 2018-09-23
Status: Merged
Merged at revision: 2840
Proposed branch: lp:~rbalint/update-manager/fix-blank-package-list
Merge into: lp:update-manager
Diff against target: 26 lines (+7/-2)
1 file modified
UpdateManager/Core/UpdateList.py (+7/-2)
To merge this branch: bzr merge lp:~rbalint/update-manager/fix-blank-package-list
Reviewer Review Type Date Requested Status
Julian Andres Klode 2018-09-23 Approve on 2018-09-27
Review via email: mp+355526@code.launchpad.net
To post a comment you must log in.
Julian Andres Klode (juliank) wrote :

I have no idea what this does.

review: Abstain
Julian Andres Klode (juliank) wrote :

Seems OK

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'UpdateManager/Core/UpdateList.py'
2--- UpdateManager/Core/UpdateList.py 2018-03-21 17:41:10 +0000
3+++ UpdateManager/Core/UpdateList.py 2018-09-27 11:02:38 +0000
4@@ -499,7 +499,6 @@
5 if not is_security_update:
6 if self._is_ignored_phased_update(pkg):
7 self.ignored_phased_updates.append(pkg)
8- pkg.mark_keep()
9 continue
10
11 if is_security_update:
12@@ -517,7 +516,13 @@
13 cache.versioned_kernel_pkgs_regexp.match(pkg.name) and
14 not cache.running_kernel_pkgs_regexp.match(pkg.name))):
15 kernel_autoremove_pkgs.append(pkg)
16- pkg.mark_delete()
17+
18+ # perform operations after the loop to not skip packages which
19+ # changed state due to the resolver
20+ for pkg in kernel_autoremove_pkgs:
21+ pkg.mark_delete()
22+ for pkg in self.ignored_phased_updates:
23+ pkg.mark_keep()
24
25 if security_pkgs or upgrade_pkgs:
26 # There's updates available. Initiate the desktop file cache.

Subscribers

People subscribed via source and target branches

to status/vote changes: