summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChris St. Pierre <chris.a.st.pierre@gmail.com>2012-06-21 12:34:03 -0400
committerChris St. Pierre <chris.a.st.pierre@gmail.com>2012-06-21 12:34:03 -0400
commite93478e013d1cda7f77771f622f5c99ac0199979 (patch)
treeb122f442cbe90bbdf93f932b19a7ee4fb1d2495e
parenta01b57c799d0eb24c4122003c0c295026edc48ba (diff)
downloadbcfg2-e93478e013d1cda7f77771f622f5c99ac0199979.tar.gz
bcfg2-e93478e013d1cda7f77771f622f5c99ac0199979.tar.bz2
bcfg2-e93478e013d1cda7f77771f622f5c99ac0199979.zip
fixed changed events in Cfg; stringification of FAM objects
-rw-r--r--src/lib/Bcfg2/Server/FileMonitor/__init__.py2
-rw-r--r--src/lib/Bcfg2/Server/Plugins/Cfg/__init__.py1
2 files changed, 2 insertions, 1 deletions
diff --git a/src/lib/Bcfg2/Server/FileMonitor/__init__.py b/src/lib/Bcfg2/Server/FileMonitor/__init__.py
index 784384c65..74b3b1560 100644
--- a/src/lib/Bcfg2/Server/FileMonitor/__init__.py
+++ b/src/lib/Bcfg2/Server/FileMonitor/__init__.py
@@ -42,7 +42,7 @@ class FileMonitor(object):
return "%s: %s" % (__name__, self.__class__.__name__)
def __repr__(self):
- return "%s (%s events, fd %s)" % (str(self), len(events), self.fileno)
+ return "%s (%s events, fd %s)" % (str(self), len(self.events), self.fileno)
def should_ignore(self, event):
for pattern in self.ignore:
diff --git a/src/lib/Bcfg2/Server/Plugins/Cfg/__init__.py b/src/lib/Bcfg2/Server/Plugins/Cfg/__init__.py
index 15fd71644..5293d7c94 100644
--- a/src/lib/Bcfg2/Server/Plugins/Cfg/__init__.py
+++ b/src/lib/Bcfg2/Server/Plugins/Cfg/__init__.py
@@ -198,6 +198,7 @@ class CfgEntrySet(Bcfg2.Server.Plugin.EntrySet):
return
elif action == 'changed':
self.entries[event.filename].handle_event(event)
+ return
elif action == 'deleted':
del self.entries[event.filename]
return