rebase of the patches
Sylvestre Ledru
2 years ago
| 7 | 7 | setup.py | 16 +--------------- |
| 8 | 8 | 1 file changed, 1 insertion(+), 15 deletions(-) |
| 9 | 9 | |
| 10 | diff --git a/setup.py b/setup.py | |
| 11 | index f4c2550f6..98413273c 100755 | |
| 12 | --- a/setup.py | |
| 13 | +++ b/setup.py | |
| 14 | @@ -48,7 +48,7 @@ | |
| 10 | Index: fail2ban/setup.py | |
| 11 | =================================================================== | |
| 12 | --- fail2ban.orig/setup.py | |
| 13 | +++ fail2ban/setup.py | |
| 14 | @@ -56,7 +56,7 @@ import warnings | |
| 15 | 15 | from glob import glob |
| 16 | 16 | |
| 17 | 17 | from fail2ban.setup import updatePyExec |
| 20 | 20 | |
| 21 | 21 | source_dir = os.path.realpath(os.path.dirname( |
| 22 | 22 | # __file__ seems to be overwritten sometimes on some python versions (e.g. bug of 2.6 by running under cProfile, etc.): |
| 23 | @@ -112,22 +112,12 @@ def update_scripts(self, dry_run=False): | |
| 23 | @@ -120,22 +120,12 @@ class install_scripts_f2b(install_script | |
| 24 | 24 | # Wrapper to specify fail2ban own options: |
| 25 | 25 | class install_command_f2b(install): |
| 26 | 26 | user_options = install.user_options + [ |
| 43 | 43 | if self.without_tests: |
| 44 | 44 | self.distribution.scripts.remove('bin/fail2ban-testcases') |
| 45 | 45 | |
| 46 | @@ -178,7 +168,6 @@ def run(self): | |
| 46 | @@ -186,7 +176,6 @@ commands.''' | |
| 47 | 47 | if setuptools: |
| 48 | 48 | setup_extra = { |
| 49 | 49 | 'test_suite': "fail2ban.tests.utils.gatherTests", |
| 51 | 51 | } |
| 52 | 52 | else: |
| 53 | 53 | setup_extra = {} |
| 54 | @@ -202,9 +191,6 @@ def run(self): | |
| 54 | @@ -210,9 +199,6 @@ if platform_system in ('linux', 'solaris | |
| 55 | 55 | ('/usr/share/doc/fail2ban', doc_files) |
| 56 | 56 | ) |
| 57 | 57 | |