mirror of
https://github.com/Mikaela/Limnoria.git
synced 2024-10-14 17:59:29 +02:00
Fix for bug #1036861.
This commit is contained in:
parent
4d27ef28f7
commit
550bcdad5d
@ -540,7 +540,7 @@ class IrcChannelCreator(Creator):
|
|||||||
def ignore(self, rest, lineno):
|
def ignore(self, rest, lineno):
|
||||||
if self.name is None:
|
if self.name is None:
|
||||||
raise ValueError, 'Unexpected channel description without channel.'
|
raise ValueError, 'Unexpected channel description without channel.'
|
||||||
(pattern, expiration) = rest
|
(pattern, expiration) = rest.split()
|
||||||
self.c.ignores[pattern] = int(float(expiration))
|
self.c.ignores[pattern] = int(float(expiration))
|
||||||
|
|
||||||
def finish(self):
|
def finish(self):
|
||||||
@ -569,9 +569,11 @@ class UsersDictionary(utils.IterableMap):
|
|||||||
reader.readFile(filename)
|
reader.readFile(filename)
|
||||||
self.noFlush = False
|
self.noFlush = False
|
||||||
self.flush()
|
self.flush()
|
||||||
except Exception, e:
|
except EnvironmentError, e:
|
||||||
log.error('Invalid user dictionary file, resetting to empty.')
|
log.error('Invalid user dictionary file, resetting to empty.')
|
||||||
log.error('Exact error: %s', utils.exnToString(e))
|
log.error('Exact error: %s', utils.exnToString(e))
|
||||||
|
except Exception, e:
|
||||||
|
log.exception('Exact error:')
|
||||||
finally:
|
finally:
|
||||||
self.noFlush = False
|
self.noFlush = False
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user