diff options
| author | Alexander Sulfrian <alexander@sulfrian.net> | 2015-02-19 02:21:02 +0100 |
|---|---|---|
| committer | Alexander Sulfrian <alexander@sulfrian.net> | 2015-02-19 02:21:02 +0100 |
| commit | 445d65f4093ffb0b5f03c427711e7c8a9e348ee6 (patch) | |
| tree | 3e9883dfa638a5a9ee628f388cae95c60cf57a0a | |
| parent | db4a3b0426f4912639c142366ff27594d54ce360 (diff) | |
| download | bcfg2-445d65f4093ffb0b5f03c427711e7c8a9e348ee6.tar.gz bcfg2-445d65f4093ffb0b5f03c427711e7c8a9e348ee6.tar.bz2 bcfg2-445d65f4093ffb0b5f03c427711e7c8a9e348ee6.zip | |
Client/Tools: Report the version of extra packages as current_version.
The version of extra packages should be reported as current_version and
not as target_version.
| -rw-r--r-- | src/lib/Bcfg2/Client/Tools/APT.py | 4 | ||||
| -rw-r--r-- | src/lib/Bcfg2/Client/Tools/Pkgng.py | 4 | ||||
| -rw-r--r-- | src/lib/Bcfg2/Client/Tools/__init__.py | 3 |
3 files changed, 6 insertions, 5 deletions
diff --git a/src/lib/Bcfg2/Client/Tools/APT.py b/src/lib/Bcfg2/Client/Tools/APT.py index aaeb969e3..9ff77d310 100644 --- a/src/lib/Bcfg2/Client/Tools/APT.py +++ b/src/lib/Bcfg2/Client/Tools/APT.py @@ -94,8 +94,8 @@ class APT(Bcfg2.Client.Tools.Tool): packages = [entry.get('name') for entry in self.getSupportedEntries()] extras = [(p.name, p.installed.version) for p in self.pkg_cache if p.is_installed and p.name not in packages] - return [Bcfg2.Client.XML.Element('Package', name=name, - type='deb', version=version) + return [Bcfg2.Client.XML.Element('Package', name=name, type='deb', + current_version=version) for (name, version) in extras] def VerifyDebsums(self, entry, modlist): diff --git a/src/lib/Bcfg2/Client/Tools/Pkgng.py b/src/lib/Bcfg2/Client/Tools/Pkgng.py index 8989e084d..08f7dc517 100644 --- a/src/lib/Bcfg2/Client/Tools/Pkgng.py +++ b/src/lib/Bcfg2/Client/Tools/Pkgng.py @@ -66,8 +66,8 @@ class Pkgng(Bcfg2.Client.Tools.Tool): packages = [entry.get('name') for entry in self.getSupportedEntries()] extras = [(name, value) for (name, value) in self.pkg_cache.items() if name not in packages] - return [Bcfg2.Client.XML.Element('Package', name=name, - type='pkgng', version=version) + return [Bcfg2.Client.XML.Element('Package', name=name, type='pkgng', + current_version=version) for (name, version) in extras] def VerifyChecksums(self, entry, modlist): diff --git a/src/lib/Bcfg2/Client/Tools/__init__.py b/src/lib/Bcfg2/Client/Tools/__init__.py index aaadc1428..2e3421840 100644 --- a/src/lib/Bcfg2/Client/Tools/__init__.py +++ b/src/lib/Bcfg2/Client/Tools/__init__.py @@ -503,7 +503,8 @@ class PkgTool(Tool): extras = [data for data in list(self.installed.items()) if data[0] not in packages] return [Bcfg2.Client.XML.Element('Package', name=name, - type=self.pkgtype, version=version) + type=self.pkgtype, + current_version=version) for (name, version) in extras] FindExtra.__doc__ = Tool.FindExtra.__doc__ |