Arturo Borrero Gonzalez has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/404736 )
Change subject: apt: unattended-upgrades: improvements for apt-upgrade script ...................................................................... apt: unattended-upgrades: improvements for apt-upgrade script Some improvements and cleanups for this script as reported at: https://gerrit.wikimedia.org/r/#/c/398079/ Change-Id: I4ead8b545e57cd135cee313636c816da194cacfd Reported-by: Riccardo Coccioli "Volans" <[email protected]> Signed-off-by: Arturo Borrero Gonzalez <[email protected]> --- M modules/apt/files/apt-upgrade.py 1 file changed, 5 insertions(+), 8 deletions(-) Approvals: Arturo Borrero Gonzalez: Verified; Looks good to me, approved jenkins-bot: Verified Volans: Looks good to me, but someone else must approve diff --git a/modules/apt/files/apt-upgrade.py b/modules/apt/files/apt-upgrade.py index 7d4e117..fb3415b 100644 --- a/modules/apt/files/apt-upgrade.py +++ b/modules/apt/files/apt-upgrade.py @@ -5,7 +5,6 @@ import sys import apt import apt_pkg -import apt.cache # Common usage: # 'apt-upgrade stretch-security upgrade packages from stretch-security @@ -32,7 +31,7 @@ if not verbose: return name = pkg.name - orig = pkg._pkg.current_ver.ver_str + orig = pkg.installed.version if pkg.marked_delete: dest = "remove" else: @@ -71,8 +70,7 @@ """ filtering function :param pkg: Package """ - if pkg.is_installed and pkg.is_upgradable and \ - pkg.candidate.origins[0].archive == self.src: + if pkg.is_installed and pkg.is_upgradable and pkg.candidate.origins[0].archive == self.src: return True return False @@ -84,15 +82,14 @@ :param simulate: boolean :param verbose: boolean """ - cache = apt.Cache() + cache = apt.cache.FilteredCache() print_verbose(verbose, "Updating cache ...") cache.update() cache.open(None) - fcache = apt.cache.FilteredCache(cache) - fcache.set_filter(AptFilter(src)) + cache.set_filter(AptFilter(src)) pkgs_to_upgrade = False - for pkg_name in fcache.keys(): + for pkg_name in cache.keys(): pkgs_to_upgrade += pkg_upgrade(verbose, cache[pkg_name]) if not pkgs_to_upgrade: -- To view, visit https://gerrit.wikimedia.org/r/404736 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I4ead8b545e57cd135cee313636c816da194cacfd Gerrit-PatchSet: 3 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Arturo Borrero Gonzalez <[email protected]> Gerrit-Reviewer: Arturo Borrero Gonzalez <[email protected]> Gerrit-Reviewer: Volans <[email protected]> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
