summaryrefslogtreecommitdiffstats
path: root/src/lib/Bcfg2/Server/Plugin
diff options
context:
space:
mode:
authorChris St. Pierre <chris.a.st.pierre@gmail.com>2013-01-17 11:01:51 -0500
committerChris St. Pierre <chris.a.st.pierre@gmail.com>2013-01-17 11:01:51 -0500
commit19d20b6f254c67ab2de4a932f1e5bbb0e30dc1f3 (patch)
tree4413c8d6b2d7d1b808523f7355c13ddb086a55c7 /src/lib/Bcfg2/Server/Plugin
parent1a6ad2805f5b12ed111f7a3a6adb127f2cbcef8e (diff)
downloadbcfg2-19d20b6f254c67ab2de4a932f1e5bbb0e30dc1f3.tar.gz
bcfg2-19d20b6f254c67ab2de4a932f1e5bbb0e30dc1f3.tar.bz2
bcfg2-19d20b6f254c67ab2de4a932f1e5bbb0e30dc1f3.zip
fixed unit tests from merge
Diffstat (limited to 'src/lib/Bcfg2/Server/Plugin')
-rw-r--r--src/lib/Bcfg2/Server/Plugin/helpers.py5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/lib/Bcfg2/Server/Plugin/helpers.py b/src/lib/Bcfg2/Server/Plugin/helpers.py
index 6ad18fa43..8d97ed6b4 100644
--- a/src/lib/Bcfg2/Server/Plugin/helpers.py
+++ b/src/lib/Bcfg2/Server/Plugin/helpers.py
@@ -571,9 +571,8 @@ class StructFile(XMLFileBacked):
#: Whether or not encryption support is enabled in this file
encryption = True
- def __init__(self, filename, fam=None, should_monitor=False):
- XMLFileBacked.__init__(self, filename, fam=fam,
- should_monitor=should_monitor)
+ def __init__(self, filename, should_monitor=False):
+ XMLFileBacked.__init__(self, filename, should_monitor=should_monitor)
self.setup = Bcfg2.Options.get_option_parser()
def Index(self):