From 3023fad087f2aaf701a91e1df9614821c074fa77 Mon Sep 17 00:00:00 2001 From: Narayan Desai Date: Wed, 13 Oct 2004 14:14:23 +0000 Subject: ignore .swp files 2004/10/12 16:02:51-05:00 anl.gov!desai handle file read errors (Logical change 1.91) git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@426 ce84e21b-d406-0410-9b95-82705330c041 --- src/lib/Server/Generator.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'src/lib/Server/Generator.py') diff --git a/src/lib/Server/Generator.py b/src/lib/Server/Generator.py index a1dad5da9..c08de99f5 100644 --- a/src/lib/Server/Generator.py +++ b/src/lib/Server/Generator.py @@ -71,7 +71,10 @@ class FileBacked(object): self.HandleEvent() def HandleEvent(self, event=None): - self.data = file(self.name).read() + try: + self.data = file(self.name).read() + except IOError, e: + syslog(LOG_ERR, "Failed to read file %s"%(self.name)) self.Index() def Index(self): @@ -98,7 +101,7 @@ class DirectoryBacked(object): if self.entries.has_key(name): print "got multiple adds" else: - if ((name[-1] == '~') or (name[:2] == '.#') or (name == 'SCCS')): + if ((name[-1] == '~') or (name[:2] == '.#') or (name == 'SCCS') or (name[-4:] == '.swp')): return self.entries[name] = self.__child__('%s/%s'%(self.name, name)) self.entries[name].HandleEvent() -- cgit v1.2.3-1-g7c22