diff options
| author | Calen Pennington <cpennington@wgen.net> | 2011-09-13 15:52:04 -0400 |
|---|---|---|
| committer | Sol Jerome <sol.jerome@gmail.com> | 2011-09-14 16:01:11 -0500 |
| commit | a3f986e98b29bfa5f1f5dfd82bac52274091c440 (patch) | |
| tree | 6f55a5e069cb0c1aa199e8064728f55c08b06956 /src/lib | |
| parent | ebc27d5ee8536467f892f41496c87ca8c31aa486 (diff) | |
| download | bcfg2-a3f986e98b29bfa5f1f5dfd82bac52274091c440.tar.gz bcfg2-a3f986e98b29bfa5f1f5dfd82bac52274091c440.tar.bz2 bcfg2-a3f986e98b29bfa5f1f5dfd82bac52274091c440.zip | |
Fix predicate call from Pkgmgr
Signed-off-by: Sol Jerome <sol.jerome@gmail.com>
Diffstat (limited to 'src/lib')
| -rw-r--r-- | src/lib/Server/Plugins/Pkgmgr.py | 5 |
1 files changed, 3 insertions, 2 deletions
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<name>[\w-]+)-(?P<version>[\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]) |