diff options
author | Alexander Sulfrian <alexander@sulfrian.net> | 2013-03-08 03:43:45 +0100 |
---|---|---|
committer | Alexander Sulfrian <alexander@sulfrian.net> | 2015-02-07 19:49:46 +0100 |
commit | bb4feaed74fcc2fe8bed4251b83cad0eebcc874f (patch) | |
tree | 9f27c18f462e3fd77864f3b2dc3db3e623793cee | |
parent | c49ac050e6e2a7939f17b5be48ca0e9ca8cc6994 (diff) | |
download | bcfg2-bb4feaed74fcc2fe8bed4251b83cad0eebcc874f.tar.gz bcfg2-bb4feaed74fcc2fe8bed4251b83cad0eebcc874f.tar.bz2 bcfg2-bb4feaed74fcc2fe8bed4251b83cad0eebcc874f.zip |
Client/Tools/APT: save new package version for auto pkgs
For auto/any packages, currently only auto/any is stored in the
statistics as the new installed version. This patch changes this
behavior, so that the exact version string is saved additionaly.
-rw-r--r-- | src/lib/Bcfg2/Client/Tools/APT.py | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/lib/Bcfg2/Client/Tools/APT.py b/src/lib/Bcfg2/Client/Tools/APT.py index 06bb81ecb..62146a461 100644 --- a/src/lib/Bcfg2/Client/Tools/APT.py +++ b/src/lib/Bcfg2/Client/Tools/APT.py @@ -185,13 +185,15 @@ class APT(Bcfg2.Client.Tools.Tool): pkg = self.pkg_cache[pkgname] installed_version = pkg.installed.version - if entry.get('version') == 'auto': + if entry.get('version').startswith('auto'): if pkg.is_upgradable: desired_version = pkg.candidate.version else: desired_version = installed_version - elif entry.get('version') == 'any': + entry.set('version', "auto: %s" % desired_version) + elif entry.get('version').startswith('any'): desired_version = installed_version + entry.set('version', "any: %s" % desired_version) else: desired_version = entry.get('version') if desired_version != installed_version: @@ -234,7 +236,7 @@ class APT(Bcfg2.Client.Tools.Tool): self.logger.error("APT has no information about package %s" % pkgname) continue - if pkg.get('version') in ['auto', 'any']: + if any([pkg.get('version').startswith(v) for v in ['auto', 'any']]): try: ipkgs.append("%s=%s" % ( pkgname, |