diff options
| author | Sol Jerome <solj@ices.utexas.edu> | 2010-08-30 15:57:27 +0000 |
|---|---|---|
| committer | Sol Jerome <sol.jerome@gmail.com> | 2010-08-30 10:57:33 -0500 |
| commit | 42d9e6bacc33ac800f988ca67eae1d04b9b5c2fc (patch) | |
| tree | 68408ec472c685086268fe8c6370ec87a66a04bc /src/lib | |
| parent | fa828a85c54e0e883cfac6ad19227776c95ecb68 (diff) | |
| download | bcfg2-42d9e6bacc33ac800f988ca67eae1d04b9b5c2fc.tar.gz bcfg2-42d9e6bacc33ac800f988ca67eae1d04b9b5c2fc.tar.bz2 bcfg2-42d9e6bacc33ac800f988ca67eae1d04b9b5c2fc.zip | |
YUMng: Fix Path type='ignore' traceback (Reported by Thomas Ackermann)
Signed-off-by: Sol Jerome <sol.jerome@gmail.com>
git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@6046 ce84e21b-d406-0410-9b95-82705330c041
Diffstat (limited to 'src/lib')
| -rw-r--r-- | src/lib/Client/Tools/YUMng.py | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/src/lib/Client/Tools/YUMng.py b/src/lib/Client/Tools/YUMng.py index 87532d8fe..8acb9c57a 100644 --- a/src/lib/Client/Tools/YUMng.py +++ b/src/lib/Client/Tools/YUMng.py @@ -1,5 +1,5 @@ """This provides bcfg2 support for yum.""" -__revision__ = '$Revision: $' +__revision__ = '$Revision$' import ConfigParser import copy @@ -132,7 +132,8 @@ class YUMng(Bcfg2.Client.Tools.PkgTool): ('Package', 'rpm'), ('Path', 'ignore')] - __req__ = {'Package': ['name', 'version']} + __req__ = {'Package': ['name', 'version'], + 'Path': ['type']} __ireq__ = {'Package': ['name']} #__ireq__ = {'Package': ['name', 'version']} @@ -155,7 +156,8 @@ class YUMng(Bcfg2.Client.Tools.PkgTool): Bcfg2.Client.Tools.PkgTool.__init__(self, logger, setup, config) self.ignores = [ entry.get('name') for struct in config \ for entry in struct \ - if entry.get('type') == 'ignore' ] + if entry.tag == 'Path' and \ + entry.get('type') == 'ignore' ] self.instance_status = {} self.extra_instances = [] self.modlists = {} @@ -823,3 +825,6 @@ class YUMng(Bcfg2.Client.Tools.PkgTool): self._runYumTransaction() self.extra = self.FindExtraPackages() + def VerifyPath(self, entry, _): + """Do nothing here since we only verify Path type=ignore""" + return True |