| package base | -packages | ++ | package base | version | +packages | +groups | +licenses | last update | status | ||||||||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
| {{ package.base }} | -{{ package.packages|join(" "|safe) }} |
{{ package.version }} | +{{ package.packages|join(" "|safe) }} |
+ {{ package.groups|join(" "|safe) }} |
+ {{ package.licenses|join(" "|safe) }} |
{{ package.timestamp }} | {{ package.status }} |
| package | diff --git a/package/share/ahriman/repo-index.jinja2 b/package/share/ahriman/repo-index.jinja2 index e3b1ea13..c1a85691 100644 --- a/package/share/ahriman/repo-index.jinja2 +++ b/package/share/ahriman/repo-index.jinja2 @@ -5,11 +5,7 @@ - - - - - {% include "style.jinja2" %} + {% include "utils/style.jinja2" %} @@ -30,19 +26,32 @@ SigLevel = Database{% if has_repo_signed %}Required{% else %}Never{% endif %} Pa
|---|
| package | +package | version | +architecture | +description | +upstream url | +licenses | +groups | +depends | archive size | installed size | build date | @@ -54,6 +63,12 @@ SigLevel = Database{% if has_repo_signed %}Required{% else %}Never{% endif %} Pa
|---|---|---|---|---|---|---|---|---|---|---|---|
| {{ package.name }} | {{ package.version }} | +{{ package.architecture }} | +{{ package.description }} | +{{ package.url }} | +{{ package.licenses|join(" "|safe) }} |
+ {{ package.groups|join(" "|safe) }} |
+ {{ package.depends|join(" "|safe) }} |
{{ package.archive_size }} | {{ package.installed_size }} | {{ package.build_date }} | @@ -73,11 +88,7 @@ SigLevel = Database{% if has_repo_signed %}Required{% else %}Never{% endif %} Pa - - - - - + {% include "utils/bootstrap-scripts.jinja2" %} diff --git a/package/share/ahriman/style.jinja2 b/package/share/ahriman/style.jinja2 deleted file mode 100644 index 6f29e9e9..00000000 --- a/package/share/ahriman/style.jinja2 +++ /dev/null @@ -1 +0,0 @@ - diff --git a/package/share/ahriman/utils/bootstrap-scripts.jinja2 b/package/share/ahriman/utils/bootstrap-scripts.jinja2 new file mode 100644 index 00000000..59991111 --- /dev/null +++ b/package/share/ahriman/utils/bootstrap-scripts.jinja2 @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff --git a/package/share/ahriman/utils/style.jinja2 b/package/share/ahriman/utils/style.jinja2 new file mode 100644 index 00000000..b2ccd979 --- /dev/null +++ b/package/share/ahriman/utils/style.jinja2 @@ -0,0 +1,9 @@ + + + + + + + + diff --git a/setup.py b/setup.py index 430ea257..a1ec1fef 100644 --- a/setup.py +++ b/setup.py @@ -68,7 +68,15 @@ setup( "package/share/ahriman/build-status.jinja2", "package/share/ahriman/email-index.jinja2", "package/share/ahriman/repo-index.jinja2", - "package/share/ahriman/style.jinja2", + ]), + ("share/ahriman/build-status", [ + "package/share/ahriman/build-status/login-modal.jinja2", + "package/share/ahriman/build-status/package-actions-modals.jinja2", + "package/share/ahriman/build-status/package-actions-script.jinja2", + ]), + ("share/ahriman/utils", [ + "package/share/ahriman/utils/bootstrap-scripts.jinja2", + "package/share/ahriman/utils/style.jinja2", ]), ], diff --git a/src/ahriman/application/ahriman.py b/src/ahriman/application/ahriman.py index 75480161..c9be419b 100644 --- a/src/ahriman/application/ahriman.py +++ b/src/ahriman/application/ahriman.py @@ -27,11 +27,10 @@ from ahriman import version from ahriman.application import handlers from ahriman.models.build_status import BuildStatusEnum from ahriman.models.sign_settings import SignSettings +from ahriman.models.user_access import UserAccess # pylint thinks it is bad idea, but get the fuck off -from ahriman.models.user_access import UserAccess - SubParserAction = argparse._SubParsersAction # pylint: disable=protected-access @@ -367,7 +366,7 @@ def _set_web_parser(root: SubParserAction) -> argparse.ArgumentParser: """ parser = root.add_parser("web", help="start web server", description="start web server", formatter_class=argparse.ArgumentDefaultsHelpFormatter) - parser.set_defaults(handler=handlers.Web, lock=None, no_report=True) + parser.set_defaults(handler=handlers.Web, lock=None, no_report=True, parser=_parser) return parser diff --git a/src/ahriman/application/application.py b/src/ahriman/application/application.py index 277fe884..0f9f9edd 100644 --- a/src/ahriman/application/application.py +++ b/src/ahriman/application/application.py @@ -40,16 +40,17 @@ class Application: :ivar repository: repository instance """ - def __init__(self, architecture: str, configuration: Configuration) -> None: + def __init__(self, architecture: str, configuration: Configuration, no_report: bool) -> None: """ default constructor :param architecture: repository architecture :param configuration: configuration instance + :param no_report: force disable reporting """ self.logger = logging.getLogger("root") self.configuration = configuration self.architecture = architecture - self.repository = Repository(architecture, configuration) + self.repository = Repository(architecture, configuration, no_report) def _finalize(self, built_packages: Iterable[Package]) -> None: """ diff --git a/src/ahriman/application/handlers/add.py b/src/ahriman/application/handlers/add.py index 4af8de55..34409de9 100644 --- a/src/ahriman/application/handlers/add.py +++ b/src/ahriman/application/handlers/add.py @@ -32,14 +32,16 @@ class Add(Handler): """ @classmethod - def run(cls: Type[Handler], args: argparse.Namespace, architecture: str, configuration: Configuration) -> None: + def run(cls: Type[Handler], args: argparse.Namespace, architecture: str, + configuration: Configuration, no_report: bool) -> None: """ callback for command line :param args: command line args :param architecture: repository architecture :param configuration: configuration instance + :param no_report: force disable reporting """ - application = Application(architecture, configuration) + application = Application(architecture, configuration, no_report) application.add(args.package, args.without_dependencies) if not args.now: return diff --git a/src/ahriman/application/handlers/clean.py b/src/ahriman/application/handlers/clean.py index 8454ce91..9d6b8be9 100644 --- a/src/ahriman/application/handlers/clean.py +++ b/src/ahriman/application/handlers/clean.py @@ -32,12 +32,14 @@ class Clean(Handler): """ @classmethod - def run(cls: Type[Handler], args: argparse.Namespace, architecture: str, configuration: Configuration) -> None: + def run(cls: Type[Handler], args: argparse.Namespace, architecture: str, + configuration: Configuration, no_report: bool) -> None: """ callback for command line :param args: command line args :param architecture: repository architecture :param configuration: configuration instance + :param no_report: force disable reporting """ - Application(architecture, configuration).clean(args.no_build, args.no_cache, args.no_chroot, - args.no_manual, args.no_packages) + Application(architecture, configuration, no_report).clean(args.no_build, args.no_cache, args.no_chroot, + args.no_manual, args.no_packages) diff --git a/src/ahriman/application/handlers/create_user.py b/src/ahriman/application/handlers/create_user.py index 6fc9aca6..4be5c92a 100644 --- a/src/ahriman/application/handlers/create_user.py +++ b/src/ahriman/application/handlers/create_user.py @@ -34,12 +34,14 @@ class CreateUser(Handler): """ @classmethod - def run(cls: Type[Handler], args: argparse.Namespace, architecture: str, configuration: Configuration) -> None: + def run(cls: Type[Handler], args: argparse.Namespace, architecture: str, + configuration: Configuration, no_report: bool) -> None: """ callback for command line :param args: command line args :param architecture: repository architecture :param configuration: configuration instance + :param no_report: force disable reporting """ salt = CreateUser.get_salt(configuration) user = CreateUser.create_user(args) diff --git a/src/ahriman/application/handlers/dump.py b/src/ahriman/application/handlers/dump.py index 8a9151c8..c5f3a692 100644 --- a/src/ahriman/application/handlers/dump.py +++ b/src/ahriman/application/handlers/dump.py @@ -33,12 +33,14 @@ class Dump(Handler): _print = print @classmethod - def run(cls: Type[Handler], args: argparse.Namespace, architecture: str, configuration: Configuration) -> None: + def run(cls: Type[Handler], args: argparse.Namespace, architecture: str, + configuration: Configuration, no_report: bool) -> None: """ callback for command line :param args: command line args :param architecture: repository architecture :param configuration: configuration instance + :param no_report: force disable reporting """ dump = configuration.dump() for section, values in sorted(dump.items()): diff --git a/src/ahriman/application/handlers/handler.py b/src/ahriman/application/handlers/handler.py index 23a582ba..85bd88ad 100644 --- a/src/ahriman/application/handlers/handler.py +++ b/src/ahriman/application/handlers/handler.py @@ -27,17 +27,20 @@ from typing import Set, Type from ahriman.application.lock import Lock from ahriman.core.configuration import Configuration -from ahriman.core.exceptions import MissingArchitecture +from ahriman.core.exceptions import MissingArchitecture, MultipleArchitecture from ahriman.models.repository_paths import RepositoryPaths class Handler: """ base handler class for command callbacks + :cvar ALLOW_MULTI_ARCHITECTURE_RUN: allow to run with multiple architectures """ + ALLOW_MULTI_ARCHITECTURE_RUN = True + @classmethod - def _call(cls: Type[Handler], args: argparse.Namespace, architecture: str) -> bool: + def call(cls: Type[Handler], args: argparse.Namespace, architecture: str) -> bool: """ additional function to wrap all calls for multiprocessing library :param args: command line args @@ -47,7 +50,7 @@ class Handler: try: configuration = Configuration.from_path(args.configuration, architecture, not args.no_log) with Lock(args, architecture, configuration): - cls.run(args, architecture, configuration) + cls.run(args, architecture, configuration, args.no_report) return True except Exception: logging.getLogger("root").exception("process exception") @@ -61,9 +64,18 @@ class Handler: :return: 0 on success, 1 otherwise """ architectures = cls.extract_architectures(args) - with Pool(len(architectures)) as pool: - result = pool.starmap( - cls._call, [(args, architecture) for architecture in architectures]) + + # actually we do not have to spawn another process if it is single-process application, do we? + if len(architectures) > 1: + if not cls.ALLOW_MULTI_ARCHITECTURE_RUN: + raise MultipleArchitecture(args.command) + + with Pool(len(architectures)) as pool: + result = pool.starmap( + cls.call, [(args, architecture) for architecture in architectures]) + else: + result = [cls.call(args, architectures.pop())] + return 0 if all(result) else 1 @classmethod @@ -88,11 +100,13 @@ class Handler: return architectures @classmethod - def run(cls: Type[Handler], args: argparse.Namespace, architecture: str, configuration: Configuration) -> None: + def run(cls: Type[Handler], args: argparse.Namespace, architecture: str, + configuration: Configuration, no_report: bool) -> None: """ callback for command line :param args: command line args :param architecture: repository architecture :param configuration: configuration instance + :param no_report: force disable reporting """ raise NotImplementedError diff --git a/src/ahriman/application/handlers/init.py b/src/ahriman/application/handlers/init.py index beed55da..7d58c252 100644 --- a/src/ahriman/application/handlers/init.py +++ b/src/ahriman/application/handlers/init.py @@ -32,11 +32,13 @@ class Init(Handler): """ @classmethod - def run(cls: Type[Handler], args: argparse.Namespace, architecture: str, configuration: Configuration) -> None: + def run(cls: Type[Handler], args: argparse.Namespace, architecture: str, + configuration: Configuration, no_report: bool) -> None: """ callback for command line :param args: command line args :param architecture: repository architecture :param configuration: configuration instance + :param no_report: force disable reporting """ - Application(architecture, configuration).repository.repo.init() + Application(architecture, configuration, no_report).repository.repo.init() diff --git a/src/ahriman/application/handlers/key_import.py b/src/ahriman/application/handlers/key_import.py index 9b6b0216..18754a1e 100644 --- a/src/ahriman/application/handlers/key_import.py +++ b/src/ahriman/application/handlers/key_import.py @@ -32,11 +32,13 @@ class KeyImport(Handler): """ @classmethod - def run(cls: Type[Handler], args: argparse.Namespace, architecture: str, configuration: Configuration) -> None: + def run(cls: Type[Handler], args: argparse.Namespace, architecture: str, + configuration: Configuration, no_report: bool) -> None: """ callback for command line :param args: command line args :param architecture: repository architecture :param configuration: configuration instance + :param no_report: force disable reporting """ - Application(architecture, configuration).repository.sign.import_key(args.key_server, args.key) + Application(architecture, configuration, no_report).repository.sign.import_key(args.key_server, args.key) diff --git a/src/ahriman/application/handlers/rebuild.py b/src/ahriman/application/handlers/rebuild.py index e6613782..b318964a 100644 --- a/src/ahriman/application/handlers/rebuild.py +++ b/src/ahriman/application/handlers/rebuild.py @@ -32,16 +32,18 @@ class Rebuild(Handler): """ @classmethod - def run(cls: Type[Handler], args: argparse.Namespace, architecture: str, configuration: Configuration) -> None: + def run(cls: Type[Handler], args: argparse.Namespace, architecture: str, + configuration: Configuration, no_report: bool) -> None: """ callback for command line :param args: command line args :param architecture: repository architecture :param configuration: configuration instance + :param no_report: force disable reporting """ depends_on = set(args.depends_on) if args.depends_on else None - application = Application(architecture, configuration) + application = Application(architecture, configuration, no_report) packages = [ package for package in application.repository.packages() diff --git a/src/ahriman/application/handlers/remove.py b/src/ahriman/application/handlers/remove.py index ba570095..7a403312 100644 --- a/src/ahriman/application/handlers/remove.py +++ b/src/ahriman/application/handlers/remove.py @@ -32,11 +32,13 @@ class Remove(Handler): """ @classmethod - def run(cls: Type[Handler], args: argparse.Namespace, architecture: str, configuration: Configuration) -> None: + def run(cls: Type[Handler], args: argparse.Namespace, architecture: str, + configuration: Configuration, no_report: bool) -> None: """ callback for command line :param args: command line args :param architecture: repository architecture :param configuration: configuration instance + :param no_report: force disable reporting """ - Application(architecture, configuration).remove(args.package) + Application(architecture, configuration, no_report).remove(args.package) diff --git a/src/ahriman/application/handlers/remove_unknown.py b/src/ahriman/application/handlers/remove_unknown.py index 1e19f79c..39cc2a60 100644 --- a/src/ahriman/application/handlers/remove_unknown.py +++ b/src/ahriman/application/handlers/remove_unknown.py @@ -33,14 +33,16 @@ class RemoveUnknown(Handler): """ @classmethod - def run(cls: Type[Handler], args: argparse.Namespace, architecture: str, configuration: Configuration) -> None: + def run(cls: Type[Handler], args: argparse.Namespace, architecture: str, + configuration: Configuration, no_report: bool) -> None: """ callback for command line :param args: command line args :param architecture: repository architecture :param configuration: configuration instance + :param no_report: force disable reporting """ - application = Application(architecture, configuration) + application = Application(architecture, configuration, no_report) unknown_packages = application.unknown() if args.dry_run: for package in unknown_packages: diff --git a/src/ahriman/application/handlers/report.py b/src/ahriman/application/handlers/report.py index 79ce3c07..6bbb8bac 100644 --- a/src/ahriman/application/handlers/report.py +++ b/src/ahriman/application/handlers/report.py @@ -32,11 +32,13 @@ class Report(Handler): """ @classmethod - def run(cls: Type[Handler], args: argparse.Namespace, architecture: str, configuration: Configuration) -> None: + def run(cls: Type[Handler], args: argparse.Namespace, architecture: str, + configuration: Configuration, no_report: bool) -> None: """ callback for command line :param args: command line args :param architecture: repository architecture :param configuration: configuration instance + :param no_report: force disable reporting """ - Application(architecture, configuration).report(args.target, []) + Application(architecture, configuration, no_report).report(args.target, []) diff --git a/src/ahriman/application/handlers/search.py b/src/ahriman/application/handlers/search.py index ba026137..ce08a5e0 100644 --- a/src/ahriman/application/handlers/search.py +++ b/src/ahriman/application/handlers/search.py @@ -32,12 +32,14 @@ class Search(Handler): """ @classmethod - def run(cls: Type[Handler], args: argparse.Namespace, architecture: str, configuration: Configuration) -> None: + def run(cls: Type[Handler], args: argparse.Namespace, architecture: str, + configuration: Configuration, no_report: bool) -> None: """ callback for command line :param args: command line args :param architecture: repository architecture :param configuration: configuration instance + :param no_report: force disable reporting """ search = " ".join(args.search) packages = aur.search(search) diff --git a/src/ahriman/application/handlers/setup.py b/src/ahriman/application/handlers/setup.py index 34121b2e..d2ac8d25 100644 --- a/src/ahriman/application/handlers/setup.py +++ b/src/ahriman/application/handlers/setup.py @@ -43,14 +43,16 @@ class Setup(Handler): SUDOERS_PATH = Path("/etc/sudoers.d/ahriman") @classmethod - def run(cls: Type[Handler], args: argparse.Namespace, architecture: str, configuration: Configuration) -> None: + def run(cls: Type[Handler], args: argparse.Namespace, architecture: str, + configuration: Configuration, no_report: bool) -> None: """ callback for command line :param args: command line args :param architecture: repository architecture :param configuration: configuration instance + :param no_report: force disable reporting """ - application = Application(architecture, configuration) + application = Application(architecture, configuration, no_report) Setup.create_makepkg_configuration(args.packager, application.repository.paths) Setup.create_executable(args.build_command, architecture) Setup.create_devtools_configuration(args.build_command, architecture, args.from_configuration, diff --git a/src/ahriman/application/handlers/sign.py b/src/ahriman/application/handlers/sign.py index c5ed285e..66d1b957 100644 --- a/src/ahriman/application/handlers/sign.py +++ b/src/ahriman/application/handlers/sign.py @@ -32,11 +32,13 @@ class Sign(Handler): """ @classmethod - def run(cls: Type[Handler], args: argparse.Namespace, architecture: str, configuration: Configuration) -> None: + def run(cls: Type[Handler], args: argparse.Namespace, architecture: str, + configuration: Configuration, no_report: bool) -> None: """ callback for command line :param args: command line args :param architecture: repository architecture :param configuration: configuration instance + :param no_report: force disable reporting """ - Application(architecture, configuration).sign(args.package) + Application(architecture, configuration, no_report).sign(args.package) diff --git a/src/ahriman/application/handlers/status.py b/src/ahriman/application/handlers/status.py index ab790ae4..66e581b1 100644 --- a/src/ahriman/application/handlers/status.py +++ b/src/ahriman/application/handlers/status.py @@ -34,24 +34,27 @@ class Status(Handler): """ @classmethod - def run(cls: Type[Handler], args: argparse.Namespace, architecture: str, configuration: Configuration) -> None: + def run(cls: Type[Handler], args: argparse.Namespace, architecture: str, + configuration: Configuration, no_report: bool) -> None: """ callback for command line :param args: command line args :param architecture: repository architecture :param configuration: configuration instance + :param no_report: force disable reporting """ - application = Application(architecture, configuration) + # we are using reporter here + client = Application(architecture, configuration, no_report=False).repository.reporter if args.ahriman: - ahriman = application.repository.reporter.get_self() + ahriman = client.get_self() print(ahriman.pretty_print()) print() if args.package: packages: Iterable[Tuple[Package, BuildStatus]] = sum( - [application.repository.reporter.get(base) for base in args.package], + [client.get(base) for base in args.package], start=[]) else: - packages = application.repository.reporter.get(None) + packages = client.get(None) for package, package_status in sorted(packages, key=lambda item: item[0].base): print(package.pretty_print()) print(f"\t{package.version}") diff --git a/src/ahriman/application/handlers/status_update.py b/src/ahriman/application/handlers/status_update.py index 39647dc0..1b80ded4 100644 --- a/src/ahriman/application/handlers/status_update.py +++ b/src/ahriman/application/handlers/status_update.py @@ -32,14 +32,17 @@ class StatusUpdate(Handler): """ @classmethod - def run(cls: Type[Handler], args: argparse.Namespace, architecture: str, configuration: Configuration) -> None: + def run(cls: Type[Handler], args: argparse.Namespace, architecture: str, + configuration: Configuration, no_report: bool) -> None: """ callback for command line :param args: command line args :param architecture: repository architecture :param configuration: configuration instance + :param no_report: force disable reporting """ - client = Application(architecture, configuration).repository.reporter + # we are using reporter here + client = Application(architecture, configuration, no_report=False).repository.reporter callback: Callable[[str], None] = lambda p: client.remove(p) if args.remove else client.update(p, args.status) if args.package: # update packages statuses diff --git a/src/ahriman/application/handlers/sync.py b/src/ahriman/application/handlers/sync.py index bedd0416..51af527e 100644 --- a/src/ahriman/application/handlers/sync.py +++ b/src/ahriman/application/handlers/sync.py @@ -32,11 +32,13 @@ class Sync(Handler): """ @classmethod - def run(cls: Type[Handler], args: argparse.Namespace, architecture: str, configuration: Configuration) -> None: + def run(cls: Type[Handler], args: argparse.Namespace, architecture: str, + configuration: Configuration, no_report: bool) -> None: """ callback for command line :param args: command line args :param architecture: repository architecture :param configuration: configuration instance + :param no_report: force disable reporting """ - Application(architecture, configuration).sync(args.target, []) + Application(architecture, configuration, no_report).sync(args.target, []) diff --git a/src/ahriman/application/handlers/update.py b/src/ahriman/application/handlers/update.py index 08febe66..c9bb3fab 100644 --- a/src/ahriman/application/handlers/update.py +++ b/src/ahriman/application/handlers/update.py @@ -32,14 +32,16 @@ class Update(Handler): """ @classmethod - def run(cls: Type[Handler], args: argparse.Namespace, architecture: str, configuration: Configuration) -> None: + def run(cls: Type[Handler], args: argparse.Namespace, architecture: str, + configuration: Configuration, no_report: bool) -> None: """ callback for command line :param args: command line args :param architecture: repository architecture :param configuration: configuration instance + :param no_report: force disable reporting """ - application = Application(architecture, configuration) + application = Application(architecture, configuration, no_report) packages = application.get_updates(args.package, args.no_aur, args.no_manual, args.no_vcs, Update.log_fn(application, args.dry_run)) if args.dry_run: diff --git a/src/ahriman/application/handlers/web.py b/src/ahriman/application/handlers/web.py index 837dce4e..29c6524d 100644 --- a/src/ahriman/application/handlers/web.py +++ b/src/ahriman/application/handlers/web.py @@ -23,6 +23,7 @@ from typing import Type from ahriman.application.handlers.handler import Handler from ahriman.core.configuration import Configuration +from ahriman.core.spawn import Spawn class Web(Handler): @@ -30,14 +31,23 @@ class Web(Handler): web server handler """ + ALLOW_MULTI_ARCHITECTURE_RUN = False # required to be able to spawn external processes + @classmethod - def run(cls: Type[Handler], args: argparse.Namespace, architecture: str, configuration: Configuration) -> None: + def run(cls: Type[Handler], args: argparse.Namespace, architecture: str, + configuration: Configuration, no_report: bool) -> None: """ callback for command line :param args: command line args :param architecture: repository architecture :param configuration: configuration instance + :param no_report: force disable reporting """ + # we are using local import for optional dependencies from ahriman.web.web import run_server, setup_service - application = setup_service(architecture, configuration) + + spawner = Spawn(args.parser(), architecture, configuration) + spawner.start() + + application = setup_service(architecture, configuration, spawner) run_server(application) diff --git a/src/ahriman/core/auth/auth.py b/src/ahriman/core/auth/auth.py index 6ff0a8b8..70de402e 100644 --- a/src/ahriman/core/auth/auth.py +++ b/src/ahriman/core/auth/auth.py @@ -19,7 +19,7 @@ # from __future__ import annotations -from typing import Optional, Set, Type +from typing import Optional, Type from ahriman.core.configuration import Configuration from ahriman.models.auth_settings import AuthSettings @@ -36,8 +36,8 @@ class Auth: :cvar ALLOWED_PATHS_GROUPS: URI paths prefixes which can be accessed without authorization, predefined """ - ALLOWED_PATHS = {"/", "/favicon.ico", "/index.html", "/login", "/logout"} - ALLOWED_PATHS_GROUPS: Set[str] = set() + ALLOWED_PATHS = {"/", "/favicon.ico", "/index.html"} + ALLOWED_PATHS_GROUPS = {"/user-api"} def __init__(self, configuration: Configuration, provider: AuthSettings = AuthSettings.Disabled) -> None: """ diff --git a/src/ahriman/core/exceptions.py b/src/ahriman/core/exceptions.py index 1e452517..10a09989 100644 --- a/src/ahriman/core/exceptions.py +++ b/src/ahriman/core/exceptions.py @@ -109,6 +109,19 @@ class MissingArchitecture(Exception): Exception.__init__(self, f"Architecture required for subcommand {command}, but missing") +class MultipleArchitecture(Exception): + """ + exception which will be raised if multiple architectures are not supported by the handler + """ + + def __init__(self, command: str) -> None: + """ + default constructor + :param command: command name which throws exception + """ + Exception.__init__(self, f"Multiple architectures are not supported by subcommand {command}") + + class ReportFailed(Exception): """ report generation exception diff --git a/src/ahriman/core/repository/properties.py b/src/ahriman/core/repository/properties.py index e2b040b2..54e9ebc2 100644 --- a/src/ahriman/core/repository/properties.py +++ b/src/ahriman/core/repository/properties.py @@ -43,7 +43,13 @@ class Properties: :ivar sign: GPG wrapper instance """ - def __init__(self, architecture: str, configuration: Configuration) -> None: + def __init__(self, architecture: str, configuration: Configuration, no_report: bool) -> None: + """ + default constructor + :param architecture: repository architecture + :param configuration: configuration instance + :param no_report: force disable reporting + """ self.logger = logging.getLogger("builder") self.architecture = architecture self.configuration = configuration @@ -58,4 +64,4 @@ class Properties: self.pacman = Pacman(configuration) self.sign = GPG(architecture, configuration) self.repo = Repo(self.name, self.paths, self.sign.repository_sign_args) - self.reporter = Client.load(configuration) + self.reporter = Client() if no_report else Client.load(configuration) diff --git a/src/ahriman/core/spawn.py b/src/ahriman/core/spawn.py new file mode 100644 index 00000000..eb094d54 --- /dev/null +++ b/src/ahriman/core/spawn.py @@ -0,0 +1,137 @@ +# +# Copyright (c) 2021 ahriman team. +# +# This file is part of ahriman +# (see https://github.com/arcan1s/ahriman). +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see