diff options
Diffstat (limited to 'devbot')
| -rw-r--r-- | devbot/config.py | 10 | ||||
| -rw-r--r-- | devbot/distro.py | 3 |
2 files changed, 6 insertions, 7 deletions
diff --git a/devbot/config.py b/devbot/config.py index b8af446..f0dd30c 100644 --- a/devbot/config.py +++ b/devbot/config.py @@ -18,12 +18,6 @@ dep_files = None module_files = None package_files = None prefs_path = None -use_lib64 = os.uname()[4] == "x86_64" - -if use_lib64: - system_lib_dir = "/usr/lib64" -else: - system_lib_dir = "/usr/lib" class Module: def __init__(self, info): @@ -65,10 +59,12 @@ def set_install_dir(dir): bin_dir = os.path.join(install_dir, "bin") etc_dir = os.path.join(install_dir, "etc") - if use_lib64: + if distro.get_use_lib64(): lib_dir = os.path.join(install_dir, "lib64") + system_lib_dir = "/usr/lib64" else: lib_dir = os.path.join(install_dir, "lib") + system_lib_dir = "/usr/lib" def set_source_dir(dir): global source_dir diff --git a/devbot/distro.py b/devbot/distro.py index 89771f6..72d668e 100644 --- a/devbot/distro.py +++ b/devbot/distro.py @@ -152,6 +152,9 @@ class UbuntuPackageManager: return result +def get_use_lib64(): + return os.uname()[4] == "x86_64" and get_distro_name() != "ubuntu" + def get_package_manager(test=False, interactive=True): name, version = _get_distro_info() |