diff options
| author | Narayan Desai <desai@mcs.anl.gov> | 2009-03-13 02:35:35 +0000 |
|---|---|---|
| committer | Narayan Desai <desai@mcs.anl.gov> | 2009-03-13 02:35:35 +0000 |
| commit | c15d5b167a65d860803465d57937e6c3e225cd8c (patch) | |
| tree | 1e41c054e27933f6e8deb1dfcad61be7e1ae2d20 /src/lib/Client/Tools/RPMng.py | |
| parent | 9c9bcdd78d37d89b1da9e99dbcb477fce2afb78c (diff) | |
| download | bcfg2-c15d5b167a65d860803465d57937e6c3e225cd8c.tar.gz bcfg2-c15d5b167a65d860803465d57937e6c3e225cd8c.tar.bz2 bcfg2-c15d5b167a65d860803465d57937e6c3e225cd8c.zip | |
YUMng: implement version=auto/any support
git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@5118 ce84e21b-d406-0410-9b95-82705330c041
Diffstat (limited to 'src/lib/Client/Tools/RPMng.py')
| -rw-r--r-- | src/lib/Client/Tools/RPMng.py | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/lib/Client/Tools/RPMng.py b/src/lib/Client/Tools/RPMng.py index 3d0522950..e99b467b3 100644 --- a/src/lib/Client/Tools/RPMng.py +++ b/src/lib/Client/Tools/RPMng.py @@ -183,12 +183,13 @@ class RPMng(Bcfg2.Client.Tools.PkgTool): for attrib in entry.attrib.keys(): instance.attrib[attrib] = entry.attrib[attrib] if self.pkg_checks == 'true' and entry.get('pkg_checks', 'true') == 'true': - if entry.get('version') == 'any': - # FIXME not sure if this is synthesized properly + if 'any' in [entry.get('version'), pinned_version]: version, release = 'any', 'any' elif entry.get('version') == 'auto': - # FIXME ditto - version, release = pinned_version.split('-') + if pinned_version != None: + version, release = pinned_version.split('-') + else: + return False else: version, release = entry.get('version').split('-') instance.set('version', version) |