From ebdbc22d327a6c33794a0b62745bbbcb6893f943 Mon Sep 17 00:00:00 2001 From: Narayan Desai Date: Wed, 9 Dec 2009 17:22:59 +0000 Subject: RPMng: fix ignore filename handing (Resolves Ticket #811) git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@5617 ce84e21b-d406-0410-9b95-82705330c041 --- src/lib/Client/Tools/RPMng.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/lib/Client/Tools/RPMng.py b/src/lib/Client/Tools/RPMng.py index b1f4c087e..b8f09ed3e 100644 --- a/src/lib/Client/Tools/RPMng.py +++ b/src/lib/Client/Tools/RPMng.py @@ -363,11 +363,10 @@ class RPMng(Bcfg2.Client.Tools.PkgTool): self.instance_status[inst]['verify_fail'] = True # Check the rpm verify file results against the modlist - # and per Instance Ignores. + # and entry and per Instance Ignores. + ignores = [ig.get('name') for ig in entry.findall('Ignore')] + [ig.get('name') for ig in inst.findall('Ignore')] for file_result in result.get('files', []): - if file_result[-1] not in modlist + \ - [ignore.get('name') for ignore \ - in inst.findall('Ignore')]: + if file_result[-1] not in modlist + ignores: instance_fail = True self.instance_status[inst]['verify_fail'] = True else: -- cgit v1.2.3-1-g7c22