github
/
fail2ban
mirror of https://github.com/fail2ban/fail2ban
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge branch 'master' of git://github.com/fail2ban/fail2ban 

* 'master' of git://github.com/fail2ban/fail2ban:
  Remove trailing semicolons
pull/944/head
Yaroslav Halchenko 2015-02-02 21:21:54 -05:00
parent 8f6d9c6a5a fc0ac45f55
commit 767ac4ecac
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
fail2ban/client/filterreader.py
View File

@ -50,17 +50,17 @@ class FilterReader(DefinitionInitConfigReader):
def getCombined(self): def getCombined(self):
combinedopts = dict(list(self._opts.items()) + list(self._initOpts.items())) combinedopts = dict(list(self._opts.items()) + list(self._initOpts.items()))
if not len(combinedopts): if not len(combinedopts):
return {}; return {}
opts = CommandAction.substituteRecursiveTags(combinedopts) opts = CommandAction.substituteRecursiveTags(combinedopts)
if not opts: if not opts:
raise ValueError('recursive tag definitions unable to be resolved') raise ValueError('recursive tag definitions unable to be resolved')
return opts; return opts
def convert(self): def convert(self):
stream = list() stream = list()
opts = self.getCombined() opts = self.getCombined()
if not len(opts): if not len(opts):
return stream; return stream
for opt, value in opts.iteritems(): for opt, value in opts.iteritems():
if opt == "failregex": if opt == "failregex":
for regex in value.split('\n'): for regex in value.split('\n'):