From 18f746fa1900a739151655e3924b2fd6010e7bea Mon Sep 17 00:00:00 2001 From: actionless Date: Sun, 26 Dec 2021 21:50:01 +0100 Subject: [PATCH] fix(build: deps_lock; config): when using System Dynamic Users, use its dir instead of /tmp/ (fixes #610) --- pikaur/build.py | 5 +---- pikaur/config.py | 5 +++++ 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/pikaur/build.py b/pikaur/build.py index 16a04824..ad3b908d 100644 --- a/pikaur/build.py +++ b/pikaur/build.py @@ -15,7 +15,7 @@ ) from .i18n import translate, translate_many from .config import ( - PikaurConfig, + BUILD_DEPS_LOCK, PikaurConfig, AUR_REPOS_CACHE_PATH, BUILD_CACHE_PATH, PACKAGE_CACHE_PATH, ) from .aur import get_repo_url, find_aur_packages @@ -43,9 +43,6 @@ from .filelock import FileLock -BUILD_DEPS_LOCK = '/tmp/pikaur_build_deps.lock' - - def debug(msg: Any) -> None: print_debug(f"{color_line('build', 5)}: {str(msg)}") diff --git a/pikaur/config.py b/pikaur/config.py index eefcb9e7..8b5dbce7 100644 --- a/pikaur/config.py +++ b/pikaur/config.py @@ -46,6 +46,11 @@ else: AUR_REPOS_CACHE_PATH = os.path.join(DATA_ROOT, 'aur_repos') +if RUNNING_AS_ROOT: + BUILD_DEPS_LOCK = os.path.join(_USER_CACHE_HOME, 'pikaur_build_deps.lock') +else: + BUILD_DEPS_LOCK = '/tmp/pikaur_build_deps.lock' + def get_config_path() -> str: config_flag = '--pikaur-config'