diff --git a/ahriman-core/package/bin/ahriman-archbuild b/ahriman-core/package/bin/ahriman-archbuild index e1999e35..acacb055 100755 --- a/ahriman-core/package/bin/ahriman-archbuild +++ b/ahriman-core/package/bin/ahriman-archbuild @@ -7,16 +7,19 @@ usage() { echo "Usage: $cmd [options] -- [archbuild args]" echo " -r Repository name" echo " -a Repository architecture" + echo " -c Read devtools pacman configurations from this directory" exit 1 } repository= architecture= +pacman_config_dir= -while getopts ":r:a:" arg; do +while getopts ":r:a:c:" arg; do case "$arg" in r) repository="$OPTARG" ;; a) architecture="$OPTARG" ;; + c) pacman_config_dir="$OPTARG" ;; *) usage ;; esac done @@ -28,6 +31,17 @@ fi source "/usr/share/devtools/lib/archroot.sh" check_root "SOURCE_DATE_EPOCH,SRCDEST,SRCPKGDEST,PKGDEST,LOGDEST,NPROC,MAKEFLAGS,PACKAGER,GNUPGHOME" "${BASH_SOURCE[0]}" "$@" +# because devtools doesn't allow to read configuration from custom path +# here is a workaround, which uses unshare to bind-mount directory with configuration files +# for specific process +if [[ -n $pacman_config_dir && -z ${AHRIMAN_ARCHBUILD_MOUNTED:-} ]]; then + export AHRIMAN_ARCHBUILD_MOUNTED=1 + exec unshare --mount --propagation private bash -e -c ' + mount --bind "$0" /usr/share/devtools/pacman.conf.d + exec "$@" + ' "$(readlink -f "$pacman_config_dir")" "${BASH_SOURCE[0]}" "$@" +fi + exec bash -c ' source "$1" "${@:2}" ' "${repository}-${architecture}-build" "archbuild" "${@:$OPTIND}" diff --git a/ahriman-core/package/share/ahriman/settings/ahriman.ini b/ahriman-core/package/share/ahriman/settings/ahriman.ini index 67c92b3e..2b2187d6 100644 --- a/ahriman-core/package/share/ahriman/settings/ahriman.ini +++ b/ahriman-core/package/share/ahriman/settings/ahriman.ini @@ -1,6 +1,6 @@ [settings] ; Relative path to directory with configuration files overrides. Overrides will be applied in alphabetic order. -include = ahriman.ini.d $HOME/.config/ahriman.ini.d +include = ahriman.ini.d ${repository:root}/.config/ahriman/ahriman.ini.d ; Relative path to configuration used by logging package. logging = ahriman.ini.d/logging.ini ; Perform database migrations on the application start. Do not touch this option unless you know what you are doing. @@ -34,6 +34,8 @@ retry_backoff = 1.0 [build] ; List of additional flags passed to archbuild command. ;archbuild_flags = +; Path to local directory with devtools configuration files, which will be bind-mounted for devtools. +devtools_configs = ${repository:root}/.config/ahriman/pacman.conf.d ; Path to build command. devtools_wrapper = ahriman-archbuild ; List of packages to be ignored during automatic updates. diff --git a/ahriman-core/src/ahriman/application/handlers/setup.py b/ahriman-core/src/ahriman/application/handlers/setup.py index 40d87c5a..20e3ecfe 100644 --- a/ahriman-core/src/ahriman/application/handlers/setup.py +++ b/ahriman-core/src/ahriman/application/handlers/setup.py @@ -28,7 +28,7 @@ from urllib.parse import quote_plus as url_encode from ahriman.application.application import Application from ahriman.application.handlers.handler import Handler, SubParserAction from ahriman.core.configuration import Configuration -from ahriman.core.exceptions import MissingArchitectureError +from ahriman.core.exceptions import InitializeError, MissingArchitectureError from ahriman.core.utils import enum_values from ahriman.models.repository_id import RepositoryId from ahriman.models.sign_settings import SignSettings @@ -63,18 +63,20 @@ class Setup(Handler): if args.architecture is None or args.repository is None: raise MissingArchitectureError(args.command) - Setup.configuration_create_ahriman(args, repository_id, configuration) + target_directory = Setup.configuration_create_directory(configuration) + Setup.configuration_create_ahriman(args, repository_id, configuration, target_directory) configuration.reload() application = Application(repository_id, configuration, report=report) + paths = application.repository.paths - # basically we create configuration here as root, but it is ok, because those files are only used for reading - repository_server = f"file://{application.repository.paths.repository}" if args.server is None else args.server - Setup.configuration_create_devtools( - repository_id, args.from_configuration, args.mirror, args.multilib, repository_server) + repository_server = f"file://{paths.repository}" if args.server is None else args.server + target_directory = paths.ensure_exists(configuration.getpath("build", "devtools_configs")) + Setup.configuration_create_devtools(repository_id, args.from_configuration, target_directory, args.mirror, + args.multilib, repository_server) # finish initialization - with application.repository.paths.preserve_owner(): + with paths.preserve_owner(): application.repository.repo.init() # lazy database sync application.repository.pacman.handle # pylint: disable=pointless-statement @@ -119,7 +121,7 @@ class Setup(Handler): @staticmethod def configuration_create_ahriman(args: argparse.Namespace, repository_id: RepositoryId, - root: Configuration) -> None: + root: Configuration, target_directory: Path) -> None: """ create service specific configuration @@ -127,6 +129,7 @@ class Setup(Handler): args(argparse.Namespace): command line args repository_id(RepositoryId): repository unique identifier root(Configuration): root configuration instance + target_directory(Path): path to directory where configuration files will be written """ configuration = Configuration() @@ -164,15 +167,13 @@ class Setup(Handler): if args.generate_salt: configuration.set_option("auth", "salt", User.generate_password(20)) - include_path = next(path for path in root.getpathlist("settings", "include") if os.access(path, os.W_OK)) - (include_path / "00-setup-overrides.ini").unlink(missing_ok=True) # remove old-style configuration - target = include_path / f"00-setup-overrides-{repository_id.id}.ini" + target = target_directory / f"00-setup-overrides-{repository_id.id}.ini" with target.open("w", encoding="utf8") as ahriman_configuration: configuration.write(ahriman_configuration) @staticmethod - def configuration_create_devtools(repository_id: RepositoryId, source: Path, mirror: str | None, - multilib: bool, repository_server: str) -> None: + def configuration_create_devtools(repository_id: RepositoryId, source: Path, target_directory: Path, + mirror: str | None, multilib: bool, repository_server: str) -> None: """ create configuration for devtools based on ``source`` configuration @@ -182,6 +183,7 @@ class Setup(Handler): Args: repository_id(RepositoryId): repository unique identifier source(Path): path to source configuration file + target_directory(Path): path to directory where configuration files will be written mirror(str | None): link to package server mirror multilib(bool): add or do not multilib repository to the configuration repository_server(str): url of the repository @@ -216,8 +218,32 @@ class Setup(Handler): configuration.set_option(repository_id.name, "SigLevel", "Never") # we don't care configuration.set_option(repository_id.name, "Server", repository_server) - target = source.parent / f"{repository_id.name}-{repository_id.architecture}.conf" + target = target_directory / f"{repository_id.name}-{repository_id.architecture}.conf" with target.open("w", encoding="utf8") as devtools_configuration: configuration.write(devtools_configuration) + @staticmethod + def configuration_create_directory(root: Configuration) -> Path: + """ + create directory for includes + + Args: + root(Configuration): root configuration instance + + Returns: + Path: path to first writable directory + + Raises: + InitializeError: if no writable directories have been found + """ + for include_path in root.getpathlist("settings", "include"): + try: + directory = root.repository_paths.ensure_exists(include_path) + if os.access(directory, os.W_OK | os.X_OK): + return directory + except OSError: + continue + + raise InitializeError("No writable include directory found") + arguments = [_set_service_setup_parser] diff --git a/ahriman-core/src/ahriman/core/build_tools/task.py b/ahriman-core/src/ahriman/core/build_tools/task.py index 3178a556..2cdd22ac 100644 --- a/ahriman-core/src/ahriman/core/build_tools/task.py +++ b/ahriman-core/src/ahriman/core/build_tools/task.py @@ -38,6 +38,7 @@ class Task(LazyLogging): Attributes: archbuild_flags(list[str]): command flags for archbuild command build_command(list[str]): build command + devtools_configs(Path): path to local directory with devtools configuration files include_debug_packages(bool): whether to include debug packages or not make_flags(str): MAKEFLAGS variable for makepkg command makechrootpkg_flags(list[str]): command flags for makechrootpkg command @@ -64,6 +65,7 @@ class Task(LazyLogging): self.archbuild_flags = configuration.getlist("build", "archbuild_flags", fallback=[]) self.build_command = configuration.getlist("build", "devtools_wrapper") + self.devtools_configs = configuration.getpath("build", "devtools_configs") self._legacy_build_command = configuration.getlist("build", "build_command", fallback=[]) self.include_debug_packages = configuration.getboolean("build", "include_debug_packages", fallback=True) # even though this option is declared as list, there is no need to read it as list, @@ -116,7 +118,12 @@ class Task(LazyLogging): """ command = self._legacy_build_command[:] if not command: - command = self.build_command + ["-r", self.repository_id.name, "-a", self.repository_id.architecture, "--"] + command = self.build_command + [ + "-r", self.repository_id.name, + "-a", self.repository_id.architecture, + "-c", str(self.devtools_configs), + "--", + ] command.extend(["-r", str(self.paths.chroot)] + self.archbuild_flags) # archbuild flags command.extend(["--", "-D", str(self.paths.archive)] + self.makechrootpkg_flags) # makechrootpkg flags diff --git a/ahriman-core/src/ahriman/core/configuration/schema.py b/ahriman-core/src/ahriman/core/configuration/schema.py index ca7a5bc2..95196fce 100644 --- a/ahriman-core/src/ahriman/core/configuration/schema.py +++ b/ahriman-core/src/ahriman/core/configuration/schema.py @@ -200,6 +200,13 @@ CONFIGURATION_SCHEMA: ConfigurationSchema = { "empty": False, }, }, + "devtools_configs": { + "type": "path", + "coerce": "absolute_path", + "required": True, + "path_exists": True, + "path_type": "dir", + }, "devtools_wrapper": { "type": "list", "coerce": "list", diff --git a/ahriman-core/src/ahriman/models/repository_paths.py b/ahriman-core/src/ahriman/models/repository_paths.py index f723a58c..9585f5ef 100644 --- a/ahriman-core/src/ahriman/models/repository_paths.py +++ b/ahriman-core/src/ahriman/models/repository_paths.py @@ -103,7 +103,7 @@ class RepositoryPaths(LazyLogging): Returns: Path: path to directory in which build process is run """ - uid, _ = owner(self.root) + uid, _ = self.root_owner return self.chroot / f"{self.repository_id.name}-{self.repository_id.architecture}" / getpwuid(uid).pw_name @property @@ -127,6 +127,16 @@ class RepositoryPaths(LazyLogging): # for the chroot directory devtools will create own tree, and we don't have to specify architecture here return self.root / "chroot" / self.repository_id.name + @property + def configs(self) -> Path: + """ + get directory for local configuration files + + Returns: + Path: full path to local configuration directory + """ + return self.root / ".config" / "ahriman" + @property def packages(self) -> Path: """ @@ -323,6 +333,7 @@ class RepositoryPaths(LazyLogging): self.archive, self.cache, self.chroot, + self.configs, self.packages, self.pacman, self.repository, diff --git a/ahriman-core/tests/ahriman/application/handlers/test_handler_setup.py b/ahriman-core/tests/ahriman/application/handlers/test_handler_setup.py index f3e05102..aa1b5765 100644 --- a/ahriman-core/tests/ahriman/application/handlers/test_handler_setup.py +++ b/ahriman-core/tests/ahriman/application/handlers/test_handler_setup.py @@ -1,5 +1,6 @@ import argparse import multiprocessing +import os import pytest from pathlib import Path @@ -11,9 +12,8 @@ from urllib.parse import quote_plus as url_encode from ahriman.application.handlers.setup import Setup from ahriman.core.configuration import Configuration from ahriman.core.database import SQLite -from ahriman.core.exceptions import MissingArchitectureError +from ahriman.core.exceptions import InitializeError, MissingArchitectureError from ahriman.core.repository import Repository -from ahriman.models.repository_id import RepositoryId from ahriman.models.repository_paths import RepositoryPaths from ahriman.models.sign_settings import SignSettings @@ -51,8 +51,11 @@ def test_run(args: argparse.Namespace, configuration: Configuration, repository: must run command """ args = _default_args(args) + local = Path("local") mocker.patch("ahriman.core.database.SQLite.load", return_value=database) mocker.patch("ahriman.core.repository.Repository.load", return_value=repository) + mkdir_mock = mocker.patch("ahriman.application.handlers.setup.Setup.configuration_create_directory", + return_value=local) ahriman_configuration_mock = mocker.patch("ahriman.application.handlers.setup.Setup.configuration_create_ahriman") devtools_configuration_mock = mocker.patch("ahriman.application.handlers.setup.Setup.configuration_create_devtools") init_mock = mocker.patch("ahriman.core.alpm.repo.Repo.init") @@ -61,9 +64,16 @@ def test_run(args: argparse.Namespace, configuration: Configuration, repository: _, repository_id = configuration.check_loaded() Setup.run(args, repository_id, configuration, report=False) owner_guard_mock.assert_called_once_with() - ahriman_configuration_mock.assert_called_once_with(args, repository_id, configuration) + mkdir_mock.assert_called_once_with(configuration) + ahriman_configuration_mock.assert_called_once_with(args, repository_id, configuration, local) devtools_configuration_mock.assert_called_once_with( - repository_id, args.from_configuration, args.mirror, args.multilib, f"file://{repository_paths.repository}") + repository_id, + args.from_configuration, + configuration.getpath("build", "devtools_configs"), + args.mirror, + args.multilib, + f"file://{repository_paths.repository}", + ) init_mock.assert_called_once_with() @@ -102,11 +112,17 @@ def test_run_with_server(args: argparse.Namespace, configuration: Configuration, _, repository_id = configuration.check_loaded() Setup.run(args, repository_id, configuration, report=False) devtools_configuration_mock.assert_called_once_with( - repository_id, args.from_configuration, args.mirror, args.multilib, "server") + repository_id, + args.from_configuration, + configuration.getpath("build", "devtools_configs"), + args.mirror, + args.multilib, + "server", + ) -def test_configuration_create_ahriman(args: argparse.Namespace, configuration: Configuration, - repository_paths: RepositoryPaths, mocker: MockerFixture) -> None: +def test_configuration_create_ahriman(args: argparse.Namespace, configuration: Configuration, tmp_path: Path, + mocker: MockerFixture) -> None: """ must create configuration for the service """ @@ -114,10 +130,9 @@ def test_configuration_create_ahriman(args: argparse.Namespace, configuration: C mocker.patch("pathlib.Path.open") set_option_mock = mocker.patch("ahriman.core.configuration.Configuration.set_option") write_mock = mocker.patch("ahriman.core.configuration.Configuration.write") - remove_mock = mocker.patch("pathlib.Path.unlink", autospec=True) _, repository_id = configuration.check_loaded() - Setup.configuration_create_ahriman(args, repository_id, configuration) + Setup.configuration_create_ahriman(args, repository_id, configuration, tmp_path) set_option_mock.assert_has_calls([ MockCall("repository", "name", repository_id.name), MockCall(Configuration.section_name("build", repository_id.name, repository_id.architecture), @@ -139,15 +154,10 @@ def test_configuration_create_ahriman(args: argparse.Namespace, configuration: C MockCall("auth", "salt", pytest.helpers.anyvar(str, strict=True)), ]) write_mock.assert_called_once_with(pytest.helpers.anyvar(int)) - remove_mock.assert_called_once_with( - next( - path for path in configuration.getpathlist("settings", "include")) / - "00-setup-overrides.ini", - missing_ok=True) def test_configuration_create_ahriman_no_multilib(args: argparse.Namespace, configuration: Configuration, - mocker: MockerFixture) -> None: + tmp_path: Path, mocker: MockerFixture) -> None: """ must create configuration for the service without multilib repository """ @@ -158,14 +168,14 @@ def test_configuration_create_ahriman_no_multilib(args: argparse.Namespace, conf set_option_mock = mocker.patch("ahriman.core.configuration.Configuration.set_option") _, repository_id = configuration.check_loaded() - Setup.configuration_create_ahriman(args, repository_id, configuration) + Setup.configuration_create_ahriman(args, repository_id, configuration, tmp_path) set_option_mock.assert_has_calls([ MockCall(Configuration.section_name("alpm", repository_id.name, repository_id.architecture), "mirror", args.mirror), ]) # non-strict check called intentionally -def test_configuration_create_devtools(args: argparse.Namespace, configuration: Configuration, +def test_configuration_create_devtools(args: argparse.Namespace, configuration: Configuration, tmp_path: Path, mocker: MockerFixture) -> None: """ must create configuration for the devtools @@ -177,12 +187,12 @@ def test_configuration_create_devtools(args: argparse.Namespace, configuration: write_mock = mocker.patch("ahriman.core.configuration.Configuration.write") _, repository_id = configuration.check_loaded() - Setup.configuration_create_devtools(repository_id, args.from_configuration, None, args.multilib, "server") + Setup.configuration_create_devtools(repository_id, args.from_configuration, tmp_path, None, args.multilib, "server") add_section_mock.assert_has_calls([MockCall("multilib"), MockCall(repository_id.name)]) write_mock.assert_called_once_with(pytest.helpers.anyvar(int)) -def test_configuration_create_devtools_mirror(args: argparse.Namespace, configuration: Configuration, +def test_configuration_create_devtools_mirror(args: argparse.Namespace, configuration: Configuration, tmp_path: Path, mocker: MockerFixture) -> None: """ must create configuration for the devtools with mirror set explicitly @@ -202,14 +212,21 @@ def test_configuration_create_devtools_mirror(args: argparse.Namespace, configur set_option_mock = mocker.patch("ahriman.core.configuration.Configuration.set_option") _, repository_id = configuration.check_loaded() - Setup.configuration_create_devtools(repository_id, args.from_configuration, args.mirror, args.multilib, "server") + Setup.configuration_create_devtools( + repository_id, + args.from_configuration, + tmp_path, + args.mirror, + args.multilib, + "server", + ) get_mock.assert_has_calls([MockCall("core", "Include", fallback=None), MockCall("extra", "Include", fallback=None)]) remove_option_mock.assert_called_once_with("core", "Include") set_option_mock.assert_has_calls([MockCall("core", "Server", args.mirror)]) # non-strict check called intentionally def test_configuration_create_devtools_no_multilib(args: argparse.Namespace, configuration: Configuration, - mocker: MockerFixture) -> None: + tmp_path: Path, mocker: MockerFixture) -> None: """ must create configuration for the devtools without multilib """ @@ -219,10 +236,33 @@ def test_configuration_create_devtools_no_multilib(args: argparse.Namespace, con write_mock = mocker.patch("ahriman.core.configuration.Configuration.write") _, repository_id = configuration.check_loaded() - Setup.configuration_create_devtools(repository_id, args.from_configuration, args.mirror, False, "server") + Setup.configuration_create_devtools(repository_id, args.from_configuration, tmp_path, args.mirror, False, "server") write_mock.assert_called_once_with(pytest.helpers.anyvar(int)) +def test_configuration_create_directory(configuration: Configuration, mocker: MockerFixture) -> None: + """ + must create writable directory for includes + """ + configuration.set_option("settings", "include", f"/path1 /path2 /path3") + mkdir_mock = mocker.patch("ahriman.models.repository_paths.RepositoryPaths.ensure_exists", + side_effect=[OSError, "/path2", "/path3"]) + access_mock = mocker.patch("os.access", side_effect=[False, True]) + + assert Setup.configuration_create_directory(configuration) == "/path3" + mkdir_mock.assert_has_calls([MockCall(Path("/path1")), MockCall(Path("/path2")), MockCall(Path("/path3"))]) + access_mock.assert_has_calls([MockCall("/path2", os.W_OK | os.X_OK), MockCall("/path3", os.W_OK | os.X_OK)]) + + +def test_configuration_create_directory_no_writable(configuration: Configuration, mocker: MockerFixture) -> None: + """ + must raise InitializeError if no writable directories found + """ + mocker.patch("ahriman.models.repository_paths.RepositoryPaths.ensure_exists", side_effect=OSError) + with pytest.raises(InitializeError): + Setup.configuration_create_directory(configuration) + + def test_disallow_multi_architecture_run() -> None: """ must not allow multi architecture run diff --git a/ahriman-core/tests/ahriman/application/handlers/test_handler_validate.py b/ahriman-core/tests/ahriman/application/handlers/test_handler_validate.py index 076e6dba..358bf7b7 100644 --- a/ahriman-core/tests/ahriman/application/handlers/test_handler_validate.py +++ b/ahriman-core/tests/ahriman/application/handlers/test_handler_validate.py @@ -63,7 +63,7 @@ def test_run_default(args: argparse.Namespace, configuration: Configuration) -> default = Configuration.from_path(Configuration.SYSTEM_CONFIGURATION_PATH, repository_id) # copy autogenerated values - for section, key in (("repository", "root"),): + for section, key in (("repository", "root"), ("build", "devtools_configs")): value = configuration.get(section, key) default.set_option(section, key, value) diff --git a/ahriman-core/tests/ahriman/core/build_tools/test_task.py b/ahriman-core/tests/ahriman/core/build_tools/test_task.py index 7aa40f14..b4579ec9 100644 --- a/ahriman-core/tests/ahriman/core/build_tools/test_task.py +++ b/ahriman-core/tests/ahriman/core/build_tools/test_task.py @@ -54,7 +54,9 @@ def test_build(task_ahriman: Task, mocker: MockerFixture) -> None: assert task_ahriman.build(local) == [task_ahriman.package.base] check_output_mock.assert_called_once_with( "ahriman-archbuild", - "-r", task_ahriman.repository_id.name, "-a", task_ahriman.repository_id.architecture, + "-r", task_ahriman.repository_id.name, + "-a", task_ahriman.repository_id.architecture, + "-c", str(task_ahriman.devtools_configs), "--", "-r", str(task_ahriman.paths.chroot), "--", "-D", str(task_ahriman.paths.archive), "--", "--skippgpcheck", @@ -81,7 +83,9 @@ def test_build_environment(task_ahriman: Task, mocker: MockerFixture) -> None: task_ahriman.build(local, **environment, empty=None) check_output_mock.assert_called_once_with( "ahriman-archbuild", - "-r", task_ahriman.repository_id.name, "-a", task_ahriman.repository_id.architecture, + "-r", task_ahriman.repository_id.name, + "-a", task_ahriman.repository_id.architecture, + "-c", str(task_ahriman.devtools_configs), "--", "-r", str(task_ahriman.paths.chroot), "--", "-D", str(task_ahriman.paths.archive), "--", "--skippgpcheck", @@ -106,7 +110,9 @@ def test_build_makeflags(task_ahriman: Task, mocker: MockerFixture) -> None: task_ahriman.build(local) check_output_mock.assert_called_once_with( "ahriman-archbuild", - "-r", task_ahriman.repository_id.name, "-a", task_ahriman.repository_id.architecture, + "-r", task_ahriman.repository_id.name, + "-a", task_ahriman.repository_id.architecture, + "-c", str(task_ahriman.devtools_configs), "--", "-r", str(task_ahriman.paths.chroot), "--", "-D", str(task_ahriman.paths.archive), "--", "--skippgpcheck", @@ -130,7 +136,9 @@ def test_build_dry_run(task_ahriman: Task, mocker: MockerFixture) -> None: task_ahriman.build(local, dry_run=True) check_output_mock.assert_called_once_with( "ahriman-archbuild", - "-r", task_ahriman.repository_id.name, "-a", task_ahriman.repository_id.architecture, + "-r", task_ahriman.repository_id.name, + "-a", task_ahriman.repository_id.architecture, + "-c", str(task_ahriman.devtools_configs), "--", "-r", str(task_ahriman.paths.chroot), "--", "-D", str(task_ahriman.paths.archive), "--", "--skippgpcheck", diff --git a/docker/entrypoint.sh b/docker/entrypoint.sh index b791912d..2daf0514 100755 --- a/docker/entrypoint.sh +++ b/docker/entrypoint.sh @@ -48,7 +48,7 @@ if [ -n "$AHRIMAN_UNIX_SOCKET" ]; then fi [ -n "$AHRIMAN_PRESETUP_COMMAND" ] && eval "$AHRIMAN_PRESETUP_COMMAND" -ahriman "${AHRIMAN_DEFAULT_ARGS[@]}" service-setup "${AHRIMAN_SETUP_ARGS[@]}" +sudo -E -u "$AHRIMAN_USER" -- ahriman "${AHRIMAN_DEFAULT_ARGS[@]}" service-setup "${AHRIMAN_SETUP_ARGS[@]}" [ -n "$AHRIMAN_POSTSETUP_COMMAND" ] && eval "$AHRIMAN_POSTSETUP_COMMAND" # validate configuration if set diff --git a/tests/testresources/core/ahriman.ini b/tests/testresources/core/ahriman.ini index b65987d6..94dd2f15 100644 --- a/tests/testresources/core/ahriman.ini +++ b/tests/testresources/core/ahriman.ini @@ -23,6 +23,7 @@ allow_read_only = no [build] archbuild_flags = +devtools_configs = . devtools_wrapper = ahriman-archbuild ignore_packages = makechrootpkg_flags =