summaryrefslogtreecommitdiffstats
path: root/src/lib
diff options
context:
space:
mode:
authorNarayan Desai <desai@mcs.anl.gov>2008-07-02 18:43:04 +0000
committerNarayan Desai <desai@mcs.anl.gov>2008-07-02 18:43:04 +0000
commit88166b8675a55eb365dac9413985ee8c9dd03cbb (patch)
tree16f721aaebbdcb493257e827604df6497e3af7f0 /src/lib
parent3b6804571e7a8fa2be63135c6151979a87d263f2 (diff)
downloadbcfg2-88166b8675a55eb365dac9413985ee8c9dd03cbb.tar.gz
bcfg2-88166b8675a55eb365dac9413985ee8c9dd03cbb.tar.bz2
bcfg2-88166b8675a55eb365dac9413985ee8c9dd03cbb.zip
Fix encoding use for ProbeSet
git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@4747 ce84e21b-d406-0410-9b95-82705330c041
Diffstat (limited to 'src/lib')
-rw-r--r--src/lib/Server/Plugins/Metadata.py7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/lib/Server/Plugins/Metadata.py b/src/lib/Server/Plugins/Metadata.py
index b78d05ada..6f23eb2e4 100644
--- a/src/lib/Server/Plugins/Metadata.py
+++ b/src/lib/Server/Plugins/Metadata.py
@@ -32,10 +32,11 @@ class ClientMetadata(object):
return group in self.groups
class ProbeSet(Bcfg2.Server.Plugin.EntrySet):
- def __init__(self, path, fam):
+ def __init__(self, path, fam, encoding):
fpattern = '[A-Za-z_\-]+'
Bcfg2.Server.Plugin.EntrySet.__init__(self, fpattern, path, True,
- Bcfg2.Server.Plugin.SpecificData)
+ Bcfg2.Server.Plugin.SpecificData,
+ encoding)
fam.AddMonitor(path, self)
self.bangline = re.compile('^#!(?P<interpreter>(/\w+)+)$')
@@ -110,7 +111,7 @@ class Metadata(Bcfg2.Server.Plugin.MetadataPlugin,
self.pdirty = False
try:
loc = datastore + "/Probes"
- self.probes = ProbeSet(loc, core.fam)
+ self.probes = ProbeSet(loc, core.fam, core.encoding)
except:
self.probes = False
self.probedata = {}