summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNarayan Desai <desai@mcs.anl.gov>2004-11-30 23:02:50 +0000
committerNarayan Desai <desai@mcs.anl.gov>2004-11-30 23:02:50 +0000
commitb6b22a448846ddc014dbfc4f780ae0b93b128af6 (patch)
treef8ba7b267d814bc0a3caa6a691669716ff2583f8
parent3b922177b9ae246a741b3e0bfa17f8d836f9dc04 (diff)
downloadbcfg2-b6b22a448846ddc014dbfc4f780ae0b93b128af6.tar.gz
bcfg2-b6b22a448846ddc014dbfc4f780ae0b93b128af6.tar.bz2
bcfg2-b6b22a448846ddc014dbfc4f780ae0b93b128af6.zip
fix case where single file has single class/attributes from metadata
(Logical change 1.154) git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@688 ce84e21b-d406-0410-9b95-82705330c041
-rw-r--r--src/lib/Server/Metadata.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/lib/Server/Metadata.py b/src/lib/Server/Metadata.py
index 7e1c23996..ec1d04e4b 100644
--- a/src/lib/Server/Metadata.py
+++ b/src/lib/Server/Metadata.py
@@ -18,8 +18,8 @@ class Metadata(object):
def Applies(self, other):
'''Check if metadata styled object applies to current metadata'''
if (other.all or (other.image and (self.image == other.image)) or
- (other.classes and (self.classes == other.classes)) or
- (other.attributes and (self.attributes == other.attributes)) or
+ (other.classes and (other.classes in self.classes)) or
+ (other.attributes and (other.attributes in self.attributes)) or
(other.hostname and (self.hostname == other.hostname))):
return True
else: