diff options
| author | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2013-01-17 09:27:58 -0500 |
|---|---|---|
| committer | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2013-01-17 12:55:52 -0500 |
| commit | f8b31cfa1596a17b248e28b82362e2d5e542b8ff (patch) | |
| tree | 5551ad72c2705d5e4ba4f9018c7b5866b85b0e4f /src | |
| parent | 1a031fc131d950dd49dc425ac1726337d8e93910 (diff) | |
| download | bcfg2-f8b31cfa1596a17b248e28b82362e2d5e542b8ff.tar.gz bcfg2-f8b31cfa1596a17b248e28b82362e2d5e542b8ff.tar.bz2 bcfg2-f8b31cfa1596a17b248e28b82362e2d5e542b8ff.zip | |
StructFile: minor cleanup
Diffstat (limited to 'src')
| -rw-r--r-- | src/lib/Bcfg2/Server/Plugin/helpers.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/lib/Bcfg2/Server/Plugin/helpers.py b/src/lib/Bcfg2/Server/Plugin/helpers.py index c8e09d3d1..399ab6679 100644 --- a/src/lib/Bcfg2/Server/Plugin/helpers.py +++ b/src/lib/Bcfg2/Server/Plugin/helpers.py @@ -597,7 +597,7 @@ class StructFile(XMLFileBacked): self.setup = Bcfg2.Options.get_option_parser() def Index(self): - Bcfg2.Server.Plugin.XMLFileBacked.Index(self) + XMLFileBacked.Index(self) if self.encryption: strict = self.xdata.get( "decrypt", @@ -605,8 +605,8 @@ class StructFile(XMLFileBacked): default="strict")) == "strict" for el in self.xdata.xpath("//*[@encrypted]"): if not HAS_CRYPTO: - raise PluginExecutionError("Properties: M2Crypto is not " - "available: %s" % self.name) + raise PluginExecutionError("%s: M2Crypto is not available" + % self.name) try: el.text = self._decrypt(el).encode('ascii', 'xmlcharrefreplace') |