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
commit 767ac4ecac
1 changed files with 3 additions and 3 deletions

View File

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