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/FileProbes.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/FileProbes.py')
| -rw-r--r-- | src/lib/Bcfg2/Server/Plugins/FileProbes.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/lib/Bcfg2/Server/Plugins/FileProbes.py b/src/lib/Bcfg2/Server/Plugins/FileProbes.py index 5beec7be0..556965fca 100644 --- a/src/lib/Bcfg2/Server/Plugins/FileProbes.py +++ b/src/lib/Bcfg2/Server/Plugins/FileProbes.py @@ -10,6 +10,7 @@ import errno import binascii import lxml.etree import Bcfg2.Options +import Bcfg2.Server import Bcfg2.Server.Plugin probecode = """#!/usr/bin/env python @@ -102,7 +103,9 @@ class FileProbes(Bcfg2.Server.Plugin.Plugin, (data.get('name'), metadata.hostname)) else: try: - self.write_data(lxml.etree.XML(data.text), metadata) + self.write_data(lxml.etree.XML(data.text, + parser=Bcfg2.Server.XMLParser), + metadata) except lxml.etree.XMLSyntaxError: # if we didn't get XML back from the probe, assume # it's an error message |