diff options
| author | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2012-05-15 09:53:04 -0400 |
|---|---|---|
| committer | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2012-05-15 09:53:04 -0400 |
| commit | 4df3945eeecb31e3234e894202868a373c95e3aa (patch) | |
| tree | ff6f26f8ea84930e9f43de7ba618dd8495fcb12f /src/lib/Bcfg2/Server/Plugins/Probes.py | |
| parent | 5a4a6fc2a913d5609d3e69ae04fee55fa1c521e1 (diff) | |
| parent | 00ee09dcea30e0afa6d22331d6e2eff624f928d3 (diff) | |
| download | bcfg2-4df3945eeecb31e3234e894202868a373c95e3aa.tar.gz bcfg2-4df3945eeecb31e3234e894202868a373c95e3aa.tar.bz2 bcfg2-4df3945eeecb31e3234e894202868a373c95e3aa.zip | |
merged maint
Diffstat (limited to 'src/lib/Bcfg2/Server/Plugins/Probes.py')
| -rw-r--r-- | src/lib/Bcfg2/Server/Plugins/Probes.py | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/lib/Bcfg2/Server/Plugins/Probes.py b/src/lib/Bcfg2/Server/Plugins/Probes.py index af908eee8..22cacde55 100644 --- a/src/lib/Bcfg2/Server/Plugins/Probes.py +++ b/src/lib/Bcfg2/Server/Plugins/Probes.py @@ -2,6 +2,8 @@ import time import lxml.etree import operator import re +import os +import Bcfg2.Server try: import json @@ -93,7 +95,8 @@ class ProbeData(object): def xdata(self): if self._xdata is None: try: - self._xdata = lxml.etree.XML(self.data) + self._xdata = lxml.etree.XML(self.data, + parser=Bcfg2.Server.XMLParser) except lxml.etree.XMLSyntaxError: pass return self._xdata @@ -220,7 +223,8 @@ class Probes(Bcfg2.Server.Plugin.Plugin, def load_data(self): try: - data = lxml.etree.parse(self.data + '/probed.xml').getroot() + data = lxml.etree.parse(os.path.join(self.data, 'probed.xml'), + parser=Bcfg2.Server.XMLParser).getroot() except: self.logger.error("Failed to read file probed.xml") return |