From a3f986e98b29bfa5f1f5dfd82bac52274091c440 Mon Sep 17 00:00:00 2001 From: Calen Pennington Date: Tue, 13 Sep 2011 15:52:04 -0400 Subject: Fix predicate call from Pkgmgr Signed-off-by: Sol Jerome --- src/lib/Server/Plugins/Pkgmgr.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/lib/Server/Plugins/Pkgmgr.py b/src/lib/Server/Plugins/Pkgmgr.py index b96e7ea7d..bf674d0d0 100644 --- a/src/lib/Server/Plugins/Pkgmgr.py +++ b/src/lib/Server/Plugins/Pkgmgr.py @@ -4,6 +4,7 @@ __revision__ = '$Revision$' import logging import re import Bcfg2.Server.Plugin +import lxml logger = logging.getLogger('Bcfg2.Plugins.Pkgmgr') @@ -45,9 +46,9 @@ class PNode(Bcfg2.Server.Plugin.INode): 'encap': re.compile('^(?P[\w-]+)-(?P[\w\d\.+-]+).encap.*$')} ignore = ['Package'] - def Match(self, metadata, data): + def Match(self, metadata, data, entry=lxml.etree.Element("None")): """Return a dictionary of package mappings.""" - if self.predicate(metadata): + if self.predicate(metadata, entry): for key in self.contents: try: data[key].update(self.contents[key]) -- cgit v1.2.3-1-g7c22