summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorChris St. Pierre <chris.a.st.pierre@gmail.com>2012-08-24 11:10:51 -0400
committerChris St. Pierre <chris.a.st.pierre@gmail.com>2012-08-24 11:10:51 -0400
commit6e462508bbe27c125b025343d1fb5c0ccf702f14 (patch)
tree324ef42483d87491e3fcdd915d8eb9a8fac64f4b /src
parentbe5abd82a35ba4acb8f84edf2f6c1dfae7c81325 (diff)
downloadbcfg2-6e462508bbe27c125b025343d1fb5c0ccf702f14.tar.gz
bcfg2-6e462508bbe27c125b025343d1fb5c0ccf702f14.tar.bz2
bcfg2-6e462508bbe27c125b025343d1fb5c0ccf702f14.zip
DirectoryBacked/XMLDirectoryBacked: honor "patterns" class attribute
Diffstat (limited to 'src')
-rw-r--r--src/lib/Bcfg2/Server/Plugin.py7
1 files changed, 5 insertions, 2 deletions
diff --git a/src/lib/Bcfg2/Server/Plugin.py b/src/lib/Bcfg2/Server/Plugin.py
index 822f2894a..e34fcd099 100644
--- a/src/lib/Bcfg2/Server/Plugin.py
+++ b/src/lib/Bcfg2/Server/Plugin.py
@@ -595,7 +595,7 @@ class DirectoryBacked(object):
else:
logger.warn("Got unknown dir event %s %s %s" %
(event.requestID, event.code2str(), abspath))
- else:
+ elif self.patterns.search(event.filename):
if action in ['exists', 'created']:
self.add_entry(relpath, event)
elif action == 'changed':
@@ -613,6 +613,9 @@ class DirectoryBacked(object):
else:
logger.warn("Got unknown file event %s %s %s" %
(event.requestID, event.code2str(), abspath))
+ else:
+ logger.warn("Could not process filename %s; ignoring" %
+ event.filename)
class XMLFileBacked(FileBacked):
@@ -907,7 +910,7 @@ class InfoXML(XMLSrc):
class XMLDirectoryBacked(DirectoryBacked):
"""Directorybacked for *.xml."""
- patterns = re.compile('.*\.xml')
+ patterns = re.compile('^.*\.xml$')
__child__ = XMLFileBacked