diff options
| author | Alexander Sulfrian <alexander@sulfrian.net> | 2013-03-08 03:43:45 +0100 |
|---|---|---|
| committer | Alexander Sulfrian <alexander@sulfrian.net> | 2013-05-02 10:02:02 +0200 |
| commit | 71f16a17b2027ada463ae2b2d6404832ee6fe24a (patch) | |
| tree | f5134f94692560ba2cc01aee60d6c9c7aa339ff3 /src/lib/Client | |
| parent | f2c410e72b7bc54be0dcb3f88ae9f06a9934ceaf (diff) | |
| download | bcfg2-71f16a17b2027ada463ae2b2d6404832ee6fe24a.tar.gz bcfg2-71f16a17b2027ada463ae2b2d6404832ee6fe24a.tar.bz2 bcfg2-71f16a17b2027ada463ae2b2d6404832ee6fe24a.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.
Diffstat (limited to 'src/lib/Client')
| -rw-r--r-- | src/lib/Client/Tools/APT.py | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/lib/Client/Tools/APT.py b/src/lib/Client/Tools/APT.py index 156c86a2b..8f90d862e 100644 --- a/src/lib/Client/Tools/APT.py +++ b/src/lib/Client/Tools/APT.py @@ -190,7 +190,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'): if self._newapi: is_upgradable = self.pkg_cache._depcache.is_upgradable(pkg._pkg) else: @@ -199,8 +199,10 @@ class APT(Bcfg2.Client.Tools.Tool): desiredVersion = candidate_version else: desiredVersion = installed_version - elif entry.get('version') == 'any': + entry.set('version', "auto: %s" % desiredVersion) + elif entry.get('version').startswith('any'): desiredVersion = installed_version + entry.set('version', "any: %s" % desiredVersion) else: desiredVersion = entry.get('version') if desiredVersion != installed_version: @@ -253,7 +255,7 @@ class APT(Bcfg2.Client.Tools.Tool): if not self.pkg_cache.has_key(pkg.get('name')): 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: ipkgs.append("%s=%s" % (pkg.get('name'), self.pkg_cache[pkg.get('name')].candidate.version)) |