Merge pull request #220 from kwirk/0.9_tweaks

0.9 tweaks. file moves after the merge and exception catching
fail2ban · May 9, 2013 · ded87ba · ded87ba
2 parents 709b437 + b791244
commit ded87ba
Show file tree

Hide file tree

Showing 5 changed files with 1 addition and 1 deletion.
diff --git a/bin/fail2ban-regex b/bin/fail2ban-regex
@@ -213,7 +213,7 @@ class Fail2banRegex:
 			# Read out and set possible value of maxlines
 			try:
 				maxlines = reader.get("Init", "maxlines")
-			except NoSectionError, NoOptionError:
+			except (NoSectionError, NoOptionError):
 				# No [Init].maxlines found.
 				pass
 			else:

diff --git a/testcases/files/logs/assp → fail2ban/tests/files/logs/assp b/testcases/files/logs/assp → fail2ban/tests/files/logs/assp
diff --git a/testcases/files/logs/bsd/syslog-plain.txt → ...ban/tests/files/logs/bsd/syslog-plain.txt b/testcases/files/logs/bsd/syslog-plain.txt → ...ban/tests/files/logs/bsd/syslog-plain.txt
diff --git a/testcases/files/logs/bsd/syslog-v.txt → fail2ban/tests/files/logs/bsd/syslog-v.txt b/testcases/files/logs/bsd/syslog-v.txt → fail2ban/tests/files/logs/bsd/syslog-v.txt
diff --git a/testcases/files/logs/bsd/syslog-vv.txt → fail2ban/tests/files/logs/bsd/syslog-vv.txt b/testcases/files/logs/bsd/syslog-vv.txt → fail2ban/tests/files/logs/bsd/syslog-vv.txt