Ticket #1047: 0001-Fix-predicate-call-from-Pkgmgr.patch

File 0001-Fix-predicate-call-from-Pkgmgr.patch, 1.2 KB (added by Calen Pennington <[email protected]…>, 12 years ago)

Proposed Fix

  • src/lib/Server/Plugins/Pkgmgr.py 

    From fef500a92d37333881358736306d7934a12fff9c Mon Sep 17 00:00:00 2001
From: Calen Pennington <[email protected]>
Date: Tue, 13 Sep 2011 15:52:04 -0400
Subject: [PATCH] Fix predicate call from Pkgmgr

---
 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 b96e7ea..bf674d0 100644
    a b __revision__ = '$Revision$' 
    44import logging 
    55import re 
    66import Bcfg2.Server.Plugin 
     7import lxml 
    78 
    89logger = logging.getLogger('Bcfg2.Plugins.Pkgmgr') 
    910 
    … … class PNode(Bcfg2.Server.Plugin.INode): 
    4546                 'encap': re.compile('^(?P<name>[\w-]+)-(?P<version>[\w\d\.+-]+).encap.*$')} 
    4647    ignore = ['Package'] 
    4748 
    48     def Match(self, metadata, data): 
     49    def Match(self, metadata, data, entry=lxml.etree.Element("None")): 
    4950        """Return a dictionary of package mappings.""" 
    50         if self.predicate(metadata): 
     51        if self.predicate(metadata, entry): 
    5152            for key in self.contents: 
    5253                try: 
    5354                    data[key].update(self.contents[key])