From 42d9e6bacc33ac800f988ca67eae1d04b9b5c2fc Mon Sep 17 00:00:00 2001
From: Sol Jerome <solj@ices.utexas.edu>
Date: Mon, 30 Aug 2010 15:57:27 +0000
Subject: 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
---
 src/lib/Client/Tools/YUMng.py | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

(limited to 'src/lib/Client')

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
-- 
cgit v1.2.3-1-g7c22