added verbosity patch from one of my branches. fixed stupid indents

debian-releases/etch
Yaroslav Halchenko 2006-07-04 03:40:14 +00:00
parent 1f3e33e384
commit ed6a45f1a6
1 changed files with 4 additions and 4 deletions

View File

@ -11,7 +11,7 @@
diff -x '*~' -Naur fail2ban-0.6.1.pre/fail2ban.py fail2ban-0.6.1.post/fail2ban.py
--- fail2ban-0.6.1.pre/fail2ban.py 2006-03-19 00:20:44.000000000 -0500
+++ fail2ban-0.6.1.post/fail2ban.py 2006-07-03 23:29:58.000000000 -0400
+++ fail2ban-0.6.1.post/fail2ban.py 2006-07-03 23:39:20.000000000 -0400
@@ -161,9 +161,11 @@
"""
# enabledsections can be defined just from the command line
@ -29,9 +29,9 @@ diff -x '*~' -Naur fail2ban-0.6.1.pre/fail2ban.py fail2ban-0.6.1.post/fail2ban.p
conf["enabledsections"] = map(lambda x: x.upper(),
re.split("[:, \t\n]", opt[1]))
+ # Let's choose the maximal verbosity from cmdLine and config
+ # files: it would better describe the intent of the user
+ conf["verbose"] = max(cmdLineVerbose, conf["verbose"])
+ # Let's choose the maximal verbosity from cmdLine and config
+ # files: it would better describe the intent of the user
+ conf["verbose"] = max(cmdLineVerbose, conf["verbose"])
+
+
+presetVerbosityLevel = 0