diff options
| author | Alexander Sulfrian <alexander@sulfrian.net> | 2013-03-08 03:43:45 +0100 |
|---|---|---|
| committer | Alexander Sulfrian <alexander@sulfrian.net> | 2014-11-10 19:56:35 +0100 |
| commit | bf0312e63ae31240793b4d40c6db3140c4ef6eb6 (patch) | |
| tree | 71da238727437b51feeaf9ca56a3971b402fa88c | |
| parent | e710abbfec4c7fbb68f2e3a60589c7f38bafeaae (diff) | |
| download | bcfg2-bf0312e63ae31240793b4d40c6db3140c4ef6eb6.tar.gz bcfg2-bf0312e63ae31240793b4d40c6db3140c4ef6eb6.tar.bz2 bcfg2-bf0312e63ae31240793b4d40c6db3140c4ef6eb6.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 b5c4f9c1c..7df41b2d1 100644 --- a/src/lib/Bcfg2/Client/Tools/APT.py +++ b/src/lib/Bcfg2/Client/Tools/APT.py @@ -202,7 +202,7 @@ class APT(Bcfg2.Client.Tools.Tool): else: installed_version = pkg.installedVersion candidate_version = pkg.candidateVersion - if entry.get('version') == 'auto': + if entry.get('version').startswith('auto'): # pylint: disable=W0212 if self._newapi: is_upgradable = self.pkg_cache._depcache.is_upgradable( @@ -215,8 +215,10 @@ class APT(Bcfg2.Client.Tools.Tool): desired_version = 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: @@ -271,7 +273,7 @@ class APT(Bcfg2.Client.Tools.Tool): self.logger.error("APT has no information about package %s" % (pkg.get('name'))) continue - if pkg.get('version') in ['auto', 'any']: + if any([pkg.get('version').startswith(v) for v in ['auto', 'any']]): if self._newapi: try: ipkgs.append("%s=%s" % ( |