From 9527327d6f5536d1094cca66967b36d5139aa804 Mon Sep 17 00:00:00 2001 From: Mike McCallister Date: Tue, 16 Aug 2011 23:39:43 -0500 Subject: 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) --- src/lib/Server/Plugin.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src/lib/Server/Plugin.py') 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) -- cgit v1.2.3-1-g7c22