diff options
| author | Mike McCallister <mike@mccllstr.com> | 2011-08-16 23:39:43 -0500 |
|---|---|---|
| committer | Sol Jerome <sol.jerome@gmail.com> | 2011-08-17 07:54:15 -0500 |
| commit | 9527327d6f5536d1094cca66967b36d5139aa804 (patch) | |
| tree | b64fb87d9d0cab81da7380ff5d91261c1df5c851 /src/lib/Server/Plugin.py | |
| parent | e89f9c0b67ed72b0c594c27492691abed0c055c2 (diff) | |
| download | bcfg2-9527327d6f5536d1094cca66967b36d5139aa804.tar.gz bcfg2-9527327d6f5536d1094cca66967b36d5139aa804.tar.bz2 bcfg2-9527327d6f5536d1094cca66967b36d5139aa804.zip | |
Filter for ignored files earlier to eliminate traceback.
Ignored files (like Vim swap files) were being picked up by the File
Monitor and were causing tracebacks because they are invalid XML. Now
check for such ignored file patterns before doing any other
processing.
(cherry picked from commit c266631eb36e117bad0f297506dc301ee9cc0487)
Diffstat (limited to 'src/lib/Server/Plugin.py')
| -rw-r--r-- | src/lib/Server/Plugin.py | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/lib/Server/Plugin.py b/src/lib/Server/Plugin.py index 2e7bef5f5..6bb6e1753 100644 --- a/src/lib/Server/Plugin.py +++ b/src/lib/Server/Plugin.py @@ -515,12 +515,12 @@ class DirectoryBacked(object): abspath)) else: # Deal with events for non-directories + if ((event.filename[-1] == '~') or + (event.filename[:2] == '.#') or + (event.filename[-4:] == '.swp') or + (event.filename in ['SCCS', '.svn'])): + return if action in ['exists', 'created']: - if ((event.filename[-1] == '~') or - (event.filename[:2] == '.#') or - (event.filename[-4:] == '.swp') or - (event.filename in ['SCCS', '.svn'])): - return if not self.patterns.match(event.filename): return self.add_entry(relpath, event) |