diff options
| author | Narayan Desai <desai@mcs.anl.gov> | 2004-10-13 14:14:23 +0000 |
|---|---|---|
| committer | Narayan Desai <desai@mcs.anl.gov> | 2004-10-13 14:14:23 +0000 |
| commit | 3023fad087f2aaf701a91e1df9614821c074fa77 (patch) | |
| tree | ee561e05c5ae6ed7b9ef335f8cc7da83adc36d55 /src/lib/Server/Generator.py | |
| parent | ddd214f50b7a43590aaad2a654f78f0921924eff (diff) | |
| download | bcfg2-3023fad087f2aaf701a91e1df9614821c074fa77.tar.gz bcfg2-3023fad087f2aaf701a91e1df9614821c074fa77.tar.bz2 bcfg2-3023fad087f2aaf701a91e1df9614821c074fa77.zip | |
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
Diffstat (limited to 'src/lib/Server/Generator.py')
| -rw-r--r-- | src/lib/Server/Generator.py | 7 |
1 files changed, 5 insertions, 2 deletions
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() |