summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorNarayan Desai <desai@mcs.anl.gov>2009-11-05 04:45:28 +0000
committerNarayan Desai <desai@mcs.anl.gov>2009-11-05 04:45:28 +0000
commit336b8734c5246808de6e30ec72b65d804a8b2636 (patch)
tree2b33d325e15595cc83b6ea5889dacf7d9b92dce5 /src
parent35bac7c7a1c023f0dbda7a43e647a0372f669a76 (diff)
downloadbcfg2-336b8734c5246808de6e30ec72b65d804a8b2636.tar.gz
bcfg2-336b8734c5246808de6e30ec72b65d804a8b2636.tar.bz2
bcfg2-336b8734c5246808de6e30ec72b65d804a8b2636.zip
RPMng: Fix modlist usage (resolves verification issue reported by drtns)
git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@5527 ce84e21b-d406-0410-9b95-82705330c041
Diffstat (limited to 'src')
-rw-r--r--src/lib/Client/Tools/RPMng.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/lib/Client/Tools/RPMng.py b/src/lib/Client/Tools/RPMng.py
index f53fbcce6..b73a4ee73 100644
--- a/src/lib/Client/Tools/RPMng.py
+++ b/src/lib/Client/Tools/RPMng.py
@@ -365,9 +365,9 @@ class RPMng(Bcfg2.Client.Tools.PkgTool):
# Check the rpm verify file results against the modlist
# and per Instance Ignores.
for file_result in result.get('files', []):
- if file_result[-1] not in modlist and \
- file_result[-1] not in \
- [ignore.get('name') for ignore in inst.findall('Ignore')]:
+ if file_result[-1] not in modlist + \
+ [ignore.get('name') for ignore \
+ in inst.findall('Ignore')]:
instance_fail = True
self.instance_status[inst]['verify_fail'] = True
else: