[libsoup] meson: Use os.path.join for paths instead of string manipulation
- From: Tomas Popela <tpopela src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [libsoup] meson: Use os.path.join for paths instead of string manipulation
- Date: Wed, 18 Apr 2018 08:10:14 +0000 (UTC)
commit 7f47360ec49fa82d5119258dfe860c232cb70642
Author: Tomas Popela <tpopela redhat com>
Date: Wed Apr 18 10:09:17 2018 +0200
meson: Use os.path.join for paths instead of string manipulation
get_apache_module_dirs.py | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
---
diff --git a/get_apache_module_dirs.py b/get_apache_module_dirs.py
index 1da64fe..daef98b 100755
--- a/get_apache_module_dirs.py
+++ b/get_apache_module_dirs.py
@@ -57,23 +57,23 @@ def main():
apache_ssl_module_dir = ''
apache_php_module_dir = ''
- for lib_dir in ['/lib', '/lib64']:
+ for lib_dir in ['lib', 'lib64']:
for httpd_dir in ['apache', 'apache2', 'http', 'http2', 'httpd']:
for mpm_suffix in ['', '-' + mpm]:
- for modules_dir in ['/', '/modules/']:
- modules_path = apache_prefix + lib_dir + '/' + httpd_dir + mpm_suffix + modules_dir
- if os.path.isfile(modules_path + 'mod_auth_digest.so'):
+ for modules_dir in ['', 'modules']:
+ modules_path = os.path.join(apache_prefix, lib_dir, httpd_dir + mpm_suffix, modules_dir)
+ if os.path.isfile(os.path.join(modules_path, 'mod_auth_digest.so')):
apache_module_dir = modules_path
- if os.path.isfile(modules_path + 'mod_ssl.so'):
+ if os.path.isfile(os.path.join(modules_path, 'mod_ssl.so')):
apache_ssl_module_dir = modules_path
- if os.path.isfile(modules_path + 'libphp7.so'):
+ if os.path.isfile(os.path.join(modules_path, 'libphp7.so')):
apache_php_module_dir = modules_path
# These two are mandatory for having properly configured Apache
if apache_module_dir == '' or apache_ssl_module_dir == '':
sys.exit(1)
- print(apache_module_dir.rstrip('/') + ":" + apache_ssl_module_dir.rstrip('/') + ":" +
apache_php_module_dir.rstrip('/'), end='')
+ print(apache_module_dir + ":" + apache_ssl_module_dir + ":" + apache_php_module_dir, end='')
if __name__ == "__main__":
main()
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]