diff options
| author | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2015-02-18 08:22:59 -0600 |
|---|---|---|
| committer | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2015-02-18 08:22:59 -0600 |
| commit | ed9920711a6020fa01d564db34e0ee4800718cc6 (patch) | |
| tree | 484d99b03ab40fa7a7d7f9a97d0bc9cf2287244e | |
| parent | 8e5469199645debe48db155dacb838fdc09a10ae (diff) | |
| parent | 54c4c8f55b80dcae08e00ff69ef4de2365cc0c7c (diff) | |
| download | bcfg2-ed9920711a6020fa01d564db34e0ee4800718cc6.tar.gz bcfg2-ed9920711a6020fa01d564db34e0ee4800718cc6.tar.bz2 bcfg2-ed9920711a6020fa01d564db34e0ee4800718cc6.zip | |
Merge pull request #261 from AlexanderS/fix-decisions
Fix Decisions Plugin
| -rw-r--r-- | src/lib/Bcfg2/Server/FileMonitor/Pseudo.py | 3 | ||||
| -rw-r--r-- | src/lib/Bcfg2/Server/Plugins/Decisions.py | 6 |
2 files changed, 6 insertions, 3 deletions
diff --git a/src/lib/Bcfg2/Server/FileMonitor/Pseudo.py b/src/lib/Bcfg2/Server/FileMonitor/Pseudo.py index b1e1adab7..9781e5b75 100644 --- a/src/lib/Bcfg2/Server/FileMonitor/Pseudo.py +++ b/src/lib/Bcfg2/Server/FileMonitor/Pseudo.py @@ -17,7 +17,8 @@ class Pseudo(FileMonitor): def AddMonitor(self, path, obj, handleID=None): if handleID is None: handleID = len(list(self.handles.keys())) - self.events.append(Event(handleID, path, 'exists')) + if os.path.exists(path): + self.events.append(Event(handleID, path, 'exists')) if os.path.isdir(path): dirlist = os.listdir(path) for fname in dirlist: diff --git a/src/lib/Bcfg2/Server/Plugins/Decisions.py b/src/lib/Bcfg2/Server/Plugins/Decisions.py index b30a9acea..957426ec8 100644 --- a/src/lib/Bcfg2/Server/Plugins/Decisions.py +++ b/src/lib/Bcfg2/Server/Plugins/Decisions.py @@ -27,8 +27,10 @@ class Decisions(Bcfg2.Server.Plugin.Plugin, def __init__(self, core): Bcfg2.Server.Plugin.Plugin.__init__(self, core) Bcfg2.Server.Plugin.Decision.__init__(self) - self.whitelist = DecisionFile(os.path.join(self.data, "whitelist.xml")) - self.blacklist = DecisionFile(os.path.join(self.data, "blacklist.xml")) + self.whitelist = DecisionFile(os.path.join(self.data, "whitelist.xml"), + should_monitor=True) + self.blacklist = DecisionFile(os.path.join(self.data, "blacklist.xml"), + should_monitor=True) def GetDecisions(self, metadata, mode): return getattr(self, mode).get_decisions(metadata) |