refactor(privilege): remove function duplicated in config module

Author: actionless

.coveragerc

@@ -12,7 +12,7 @@ exclude_lines =
     NotImplemented
     if __name__ == .__main__.:
     if TYPE_CHECKING:
-    if running_as_root
+    if RunningAsRoot
     if not args.noconfirm
     if not self.args.noconfirm
     if args.debug

maintenance_scripts/get_global_expressions.sh

@@ -14,7 +14,7 @@ result=$(
 		-e TypeVar \
 		-e namedtuple \
 		\
-		-e 'create_logger\(|running_as_root|sudo' \
+		-e 'create_logger\(|sudo' \
 		\
 		-e './maintenance_scripts/find_.*.py.*:.*:' \
 		-e '.SRCINFO' \

maintenance_scripts/get_non_final_expressions.sh

@@ -12,7 +12,7 @@ result=$(
 		-e TypeVar \
 		-e namedtuple \
 		\
-		-e 'create_logger\(|running_as_root|sudo' \
+		-e 'create_logger\(|sudo' \
 		\
 		-e './maintenance_scripts/find_.*.py.*:.*:' \
 		-e '.SRCINFO' \

pikaur/build.py

@@ -16,6 +16,7 @@
     BuildDepsLockPath,
     PackageCachePath,
     PikaurConfig,
+    UsingDynamicUsers,
 )
 from .core import (
     PIPE,
@@ -56,7 +57,6 @@
 from .privilege import (
     isolate_root_cmd,
     sudo,
-    using_dynamic_users,
 )
 from .prompt import (
     ask_to_continue,
@@ -995,7 +995,7 @@ def clone_aur_repos(package_names: list[str]) -> dict[str, PackageBuild]:
     pool_size: int | None = None
     if clone_c := parse_args().aur_clone_concurrency:
         pool_size = clone_c
-    elif using_dynamic_users():
+    elif UsingDynamicUsers():
         pool_size = 1
     exc: CloneError | None = None
     with (

pikaur/install_cli.py

@@ -11,7 +11,7 @@
 from .args import parse_args, reconstruct_args
 from .aur import AURPackageInfo
 from .build import PackageBuild, PkgbuildChanged, clone_aur_repos
-from .config import DiffPagerValues, PikaurConfig
+from .config import DiffPagerValues, PikaurConfig, UsingDynamicUsers
 from .conflicts import find_aur_conflicts
 from .core import (
     PackageSource,
@@ -61,7 +61,6 @@
 from .privilege import (
     isolate_root_cmd,
     sudo,
-    using_dynamic_users,
 )
 from .prompt import (
     ask_to_continue,
@@ -830,7 +829,7 @@ def _get_installed_status(self) -> None:  # pylint: disable=too-many-branches
         # if running as root get sources for dev packages synchronously
         # (to prevent race condition in systemd dynamic users)
         num_threads: int | None = None
-        if using_dynamic_users():  # pragma: no cover
+        if UsingDynamicUsers():  # pragma: no cover
             num_threads = 1
 
         # check if pkgs versions already installed

pikaur/main.py

@@ -51,9 +51,7 @@
     get_args_to_elevate_pikaur,
     isolate_root_cmd,
     need_dynamic_users,
-    running_as_root,
     sudo,
-    using_dynamic_users,
 )
 from .prompt import NotANumberInputError, get_multiple_numbers_input
 from .search_cli import cli_search_packages, search_packages
@@ -254,7 +252,7 @@ def execute_pikaur_operation(
         args.positional += add_args
         cli_args += add_args
     if (
-            running_as_root()
+            RunningAsRoot()
             and (PikaurConfig().build.DynamicUsers.get_str() == "never" and not args.user_id)
     ):
         print_error(
@@ -266,7 +264,7 @@ def execute_pikaur_operation(
         sys.exit(1)
     elif (
             require_sudo
-            and not running_as_root()
+            and not RunningAsRoot()
             and (
                 args.privilege_escalation_target == "pikaur"
                 or need_dynamic_users()
@@ -376,7 +374,7 @@ def migrate_old_aur_repos_dir() -> None:
 
 
 def create_dirs() -> None:
-    if using_dynamic_users():
+    if UsingDynamicUsers():
         # Let systemd-run setup the directories and symlinks
         true_cmd = isolate_root_cmd(["true"])
         result = spawn(true_cmd)

pikaur/makepkg_config.py

@@ -5,9 +5,8 @@
 from typing import TYPE_CHECKING
 
 from .args import parse_args
-from .config import ConfigRoot, _UserTempRoot
+from .config import ConfigRoot, UsingDynamicUsers, _UserTempRoot
 from .core import open_file
-from .privilege import using_dynamic_users
 
 if TYPE_CHECKING:
     from typing import Final, TypeVar
@@ -142,7 +141,7 @@ class MakePkgCommand:
 
     @classmethod
     def _apply_dynamic_users_workaround(cls) -> None:
-        if not using_dynamic_users():
+        if not UsingDynamicUsers():
             return
         pkgdest = str(get_pkgdest())
         if pkgdest and (

pikaur/privilege.py

@@ -6,7 +6,6 @@
     ConfigPath,
     PikaurConfig,
     RunningAsRoot,
-    UsingDynamicUsers,
     _UserTempRoot,
 )
 
@@ -28,15 +27,7 @@ def need_dynamic_users() -> bool:
         return True
     if dynamic_users == "never":
         return False
-    return bool(running_as_root() and dynamic_users == "root")
-
-
-def using_dynamic_users() -> int:
-    return UsingDynamicUsers()
-
-
-def running_as_root() -> int:
-    return RunningAsRoot()
+    return bool(RunningAsRoot() and dynamic_users == "root")
 
 
 def sudo(cmd: list[str], preserve_env: list[str] | None = None) -> list[str]:
@@ -56,7 +47,7 @@ def isolate_root_cmd(
         cwd: str | Path | None = None,
         env: dict[str, str] | None = None,
 ) -> list[str]:
-    if not running_as_root():
+    if not RunningAsRoot():
         return cmd
     if isinstance(cwd, str):
         cwd = Path(cwd)

pikaur/srcinfo.py

@@ -3,13 +3,13 @@
 import shutil
 from pathlib import Path
 
-from .config import BuildCachePath, CacheRoot
+from .config import BuildCachePath, CacheRoot, UsingDynamicUsers
 from .core import chown_to_current, open_file, spawn
 from .exceptions import SysExit
 from .i18n import translate
 from .makepkg_config import MakePkgCommand, MakepkgConfig
 from .pprint import print_error, print_stderr
-from .privilege import isolate_root_cmd, using_dynamic_users
+from .privilege import isolate_root_cmd
 from .version import VersionMatcher
 
 
@@ -127,7 +127,7 @@ def get_version(self) -> str:
 
     def regenerate(self) -> None:
         working_directory = self.repo_path
-        if using_dynamic_users() and not str(self.repo_path).startswith(str(CacheRoot())):
+        if UsingDynamicUsers() and not str(self.repo_path).startswith(str(CacheRoot())):
             working_directory = BuildCachePath() / (
                 "_info_" + (self.get_value("pkgbase") or "unknown")
             )