Arturo Borrero Gonzalez has uploaded a new change for review. ( 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" <rcocci...@wikimedia.org> Signed-off-by: Arturo Borrero Gonzalez <aborr...@wikimedia.org> --- M modules/apt/files/apt-upgrade.py 1 file changed, 4 insertions(+), 6 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/36/404736/1 diff --git a/modules/apt/files/apt-upgrade.py b/modules/apt/files/apt-upgrade.py index 7d4e117..c0a9bda 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: @@ -84,15 +83,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: newchange Gerrit-Change-Id: I4ead8b545e57cd135cee313636c816da194cacfd Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Arturo Borrero Gonzalez <aborr...@wikimedia.org> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
