summaryrefslogtreecommitdiffstats
path: root/src/lib/Server
diff options
context:
space:
mode:
authorNarayan Desai <desai@mcs.anl.gov>2008-03-21 21:10:03 +0000
committerNarayan Desai <desai@mcs.anl.gov>2008-03-21 21:10:03 +0000
commit50bf9b6cbcc4dc7edc312198795cc524ca61e51b (patch)
treeada67b3281638ba45b72d3bd1fc1b8de1d54db59 /src/lib/Server
parent5cac7e846a385e90f14782f914bb0ebf17737e1e (diff)
downloadbcfg2-50bf9b6cbcc4dc7edc312198795cc524ca61e51b.tar.gz
bcfg2-50bf9b6cbcc4dc7edc312198795cc524ca61e51b.tar.bz2
bcfg2-50bf9b6cbcc4dc7edc312198795cc524ca61e51b.zip
Fix Specificity.matches bug and fix es_cls name
git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@4434 ce84e21b-d406-0410-9b95-82705330c041
Diffstat (limited to 'src/lib/Server')
-rw-r--r--src/lib/Server/Plugin.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/lib/Server/Plugin.py b/src/lib/Server/Plugin.py
index 0166abaa8..fd07a701e 100644
--- a/src/lib/Server/Plugin.py
+++ b/src/lib/Server/Plugin.py
@@ -418,7 +418,7 @@ class Specificity:
def matches(self, metadata):
return self.all or \
self.hostname == metadata.hostname or \
- self.group in metadata.group
+ self.group in metadata.groups
def __cmp__(self, other):
'''sort most to least specific'''
@@ -461,7 +461,7 @@ class EntrySet:
'''Handle FAM events for the TemplateSet'''
action = event.code2str()
- if event.filename in ['info', 'info.xml']:
+ if event.filename in ['info', 'info.xml', ':info']:
if action in ['exists', 'created', 'changed']:
self.update_metadata(event)
elif action == 'deleted':
@@ -501,7 +501,7 @@ class EntrySet:
if not self.infoxml:
self.infoxml = XMLSrc(fpath, True)
self.infoxml.HandleEvent(event)
- elif event.filename == 'info':
+ elif event.filename in [':info', 'info']:
for line in open(fpath).readlines():
match = info_regex.match(line)
if not match:
@@ -583,7 +583,7 @@ class GroupSpool(Plugin):
use_props = False
filename_pattern = ""
es_child_cls = object
- es_class = EntrySet
+ es_cls = EntrySet
def __init__(self, core, datastore):
Plugin.__init__(self, core, datastore)