You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
76 lines
2.6 KiB
76 lines
2.6 KiB
commit d561a4c2bbc336db70d5923cf630813bc51dc3ee
|
|
Author: Yaroslav Halchenko <debian@onerussian.com>
|
|
Date: Mon Jan 28 09:54:08 2013 -0500
|
|
|
|
BF: do not rely on scripts being under /usr -- might differ eg on Fedora -- rely on import of common.version (Closes gh-112)
|
|
|
|
This is also not ideal, since if there happens to be some systemwide common.version -- we are doomed
|
|
|
|
but otherwise, we cannot keep extending comparison check to /bin, /sbin whatelse
|
|
|
|
diff --git a/fail2ban-client b/fail2ban-client
|
|
index 1d8eb15..13d018e 100755
|
|
--- a/fail2ban-client
|
|
+++ b/fail2ban-client
|
|
@@ -27,12 +27,13 @@ import getopt, time, shlex, socket
|
|
|
|
# Inserts our own modules path first in the list
|
|
# fix for bug #343821
|
|
-if os.path.abspath(__file__).startswith('/usr/'):
|
|
- # makes sense to use system-wide library iff -client is also under /usr/
|
|
+try:
|
|
+ from common.version import version
|
|
+except ImportError, e:
|
|
sys.path.insert(1, "/usr/share/fail2ban")
|
|
+ from common.version import version
|
|
|
|
-# Now we can import our modules
|
|
-from common.version import version
|
|
+# Now we can import the rest of modules
|
|
from common.protocol import printFormatted
|
|
from client.csocket import CSocket
|
|
from client.configurator import Configurator
|
|
diff --git a/fail2ban-regex b/fail2ban-regex
|
|
index a42ed96..f9bc72c 100755
|
|
--- a/fail2ban-regex
|
|
+++ b/fail2ban-regex
|
|
@@ -26,13 +26,14 @@ import getopt, sys, time, logging, os
|
|
|
|
# Inserts our own modules path first in the list
|
|
# fix for bug #343821
|
|
-if os.path.abspath(__file__).startswith('/usr/'):
|
|
- # makes sense to use system-wide library iff -regex is also under /usr/
|
|
- sys.path.insert(1, "/usr/share/fail2ban")
|
|
+try:
|
|
+ from common.version import version
|
|
+except ImportError, e:
|
|
+ sys.path.insert(1, "/usr/share/fail2ban")
|
|
+ from common.version import version
|
|
|
|
from client.configparserinc import SafeConfigParserWithIncludes
|
|
from ConfigParser import NoOptionError, NoSectionError, MissingSectionHeaderError
|
|
-from common.version import version
|
|
from server.filter import Filter
|
|
from server.failregex import RegexException
|
|
|
|
diff --git a/fail2ban-server b/fail2ban-server
|
|
index bd86e6c..0f3410c 100755
|
|
--- a/fail2ban-server
|
|
+++ b/fail2ban-server
|
|
@@ -26,11 +26,12 @@ import getopt, sys, logging, os
|
|
|
|
# Inserts our own modules path first in the list
|
|
# fix for bug #343821
|
|
-if os.path.abspath(__file__).startswith('/usr/'):
|
|
- # makes sense to use system-wide library iff -server is also under /usr/
|
|
+try:
|
|
+ from common.version import version
|
|
+except ImportError, e:
|
|
sys.path.insert(1, "/usr/share/fail2ban")
|
|
+ from common.version import version
|
|
|
|
-from common.version import version
|
|
from server.server import Server
|
|
|
|
# Gets the instance of the logger.
|