From c98b01bd1d70be75e0b67c50fcea65b345f9acea Mon Sep 17 00:00:00 2001 From: Steven Hiscocks Date: Thu, 9 May 2013 23:37:52 +0100 Subject: [PATCH 1/2] BF: fail2ban-regex fix for maxlines init option reader --- bin/fail2ban-regex | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/fail2ban-regex b/bin/fail2ban-regex index e3d75f20..2b563cae 100755 --- 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: From b7912446ef7d3a7f4707dcf223c46ee0173e4475 Mon Sep 17 00:00:00 2001 From: Steven Hiscocks Date: Thu, 9 May 2013 23:39:52 +0100 Subject: [PATCH 2/2] TST: Move test files to correct folder for 0.9 branch --- {testcases => fail2ban/tests}/files/logs/assp | 0 {testcases => fail2ban/tests}/files/logs/bsd/syslog-plain.txt | 0 {testcases => fail2ban/tests}/files/logs/bsd/syslog-v.txt | 0 {testcases => fail2ban/tests}/files/logs/bsd/syslog-vv.txt | 0 4 files changed, 0 insertions(+), 0 deletions(-) rename {testcases => fail2ban/tests}/files/logs/assp (100%) rename {testcases => fail2ban/tests}/files/logs/bsd/syslog-plain.txt (100%) rename {testcases => fail2ban/tests}/files/logs/bsd/syslog-v.txt (100%) rename {testcases => fail2ban/tests}/files/logs/bsd/syslog-vv.txt (100%) diff --git a/testcases/files/logs/assp b/fail2ban/tests/files/logs/assp similarity index 100% rename from testcases/files/logs/assp rename to fail2ban/tests/files/logs/assp diff --git a/testcases/files/logs/bsd/syslog-plain.txt b/fail2ban/tests/files/logs/bsd/syslog-plain.txt similarity index 100% rename from testcases/files/logs/bsd/syslog-plain.txt rename to fail2ban/tests/files/logs/bsd/syslog-plain.txt diff --git a/testcases/files/logs/bsd/syslog-v.txt b/fail2ban/tests/files/logs/bsd/syslog-v.txt similarity index 100% rename from testcases/files/logs/bsd/syslog-v.txt rename to fail2ban/tests/files/logs/bsd/syslog-v.txt diff --git a/testcases/files/logs/bsd/syslog-vv.txt b/fail2ban/tests/files/logs/bsd/syslog-vv.txt similarity index 100% rename from testcases/files/logs/bsd/syslog-vv.txt rename to fail2ban/tests/files/logs/bsd/syslog-vv.txt