Release 2.22.2

CONTRIBUTING.md

@@ -247,13 +247,19 @@ tox -e docs
 
 Must be usually done if there are changes in modules structure.
 
+### Before making a new release
+
+1. Make sure that all pipelines are green.
+2. Make sure that documentation is up-to-date.
+3. Run [regress job](https://github.com/arcan1s/ahriman/actions/workflows/regress.yml). The successful link must be attached to release.
+
 ### Create release
 
 ```shell
 tox -m release -- major.minor.patch
 ```
 
-The command above will generate documentation, tags, etc., and will push them to GitHub. Other things will be handled by GitHub workflows automatically.
+The command above will generate documentation, tags, etc., and will push them to GitHub. Other things will be handled by GitHub workflows automatically. As soon as related github action completes, there will be a new release created. Edit it to add additional information if needed.
 
 ### Hotfixes policy
 

ahriman-core/package/bin/ahriman-archbuild

@@ -8,7 +8,6 @@ usage() {
     echo "    -r <repository>    Repository name"
     echo "    -a <architecture>  Repository architecture"
     echo "    -c <directory>     Read devtools pacman configurations from this directory"
-    exit 1
 }
 
 repository=
@@ -20,12 +19,18 @@ while getopts ":r:a:c:" arg; do
         r) repository="$OPTARG" ;;
         a) architecture="$OPTARG" ;;
         c) pacman_config_dir="$OPTARG" ;;
-        *) usage ;;
+        *) usage >&2; exit 1 ;;
     esac
 done
 
 if [[ -z $repository || -z $architecture ]]; then
-    usage
+    usage >&2
+    exit 1
+fi
+
+if [[ -n $pacman_config_dir && ! -d $pacman_config_dir ]]; then
+    echo "devtools configuration directory does not exist: $pacman_config_dir" >&2
+    exit 1
 fi
 
 source "/usr/share/devtools/lib/archroot.sh"
@@ -35,13 +40,13 @@ check_root "SOURCE_DATE_EPOCH,SRCDEST,SRCPKGDEST,PKGDEST,LOGDEST,NPROC,MAKEFLAGS
 # 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
+    pacman_config_dir="$(readlink -e -- "$pacman_config_dir")"
     export AHRIMAN_ARCHBUILD_MOUNTED=1
-    exec unshare --mount --propagation private bash -e -c '
+
-        mount --bind "$0" /usr/share/devtools/pacman.conf.d
+    exec unshare --mount --propagation private \
-        exec "$@"
+        bash -c 'mount --bind -- "$0" /usr/share/devtools/pacman.conf.d && exec "$@"' \
-    ' "$(readlink -f "$pacman_config_dir")" "${BASH_SOURCE[0]}" "$@"
+        "$pacman_config_dir" "${BASH_SOURCE[0]}" "$@"
 fi
 
-exec bash -c '
+exec bash -c 'source "/usr/bin/archbuild" "$@"' \
-    source "$1" "${@:2}"
+    "${repository}-${architecture}-build" "${@:$OPTIND}"
-' "${repository}-${architecture}-build" "archbuild" "${@:$OPTIND}"

ahriman-core/package/share/ahriman/settings/ahriman.ini

@@ -1,6 +1,7 @@
 [settings]
 ; Relative path to directory with configuration files overrides. Overrides will be applied in alphabetic order.
-include = ahriman.ini.d ${repository:root}/.config/ahriman/ahriman.ini.d
+include[] = ahriman.ini.d
+include[] = ${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.

ahriman-core/package/share/bash-completion/completions/_ahriman

@@ -1,140 +1,134 @@
-# AUTOMATICALLY GENERATED by `shtab`
+# AUTOMATICALLY GENERATED by https://github.com/tqdm/shtab
+# Usage:
+# 1) Copy this to somewhere (e.g. ~/.local/share/bash_completion/ahriman).
+# 2) Add the following line to your .bashrc:
+#    source ~/.local/share/bash_completion/ahriman
+# See also: https://github.com/scop/bash-completion/blob/main/doc/configuration.md
 
-_shtab_ahriman_subparsers=('add' 'aur-search' 'check' 'clean' 'config' 'config-validate' 'copy' 'daemon' 'help' 'help-commands-unsafe' 'help-updates' 'help-version' 'init' 'key-import' 'package-add' 'package-archives' 'package-changes' 'package-changes-remove' 'package-copy' 'package-hold' 'package-pkgbuild' 'package-pkgbuild-remove' 'package-remove' 'package-rollback' 'package-status' 'package-status-remove' 'package-status-update' 'package-unhold' 'package-update' 'patch-add' 'patch-list' 'patch-remove' 'patch-set-add' 'rebuild' 'remove' 'remove-unknown' 'repo-backup' 'repo-check' 'repo-clean' 'repo-config' 'repo-config-validate' 'repo-create-keyring' 'repo-create-mirrorlist' 'repo-daemon' 'repo-init' 'repo-rebuild' 'repo-remove-unknown' 'repo-report' 'repo-restore' 'repo-setup' 'repo-sign' 'repo-statistics' 'repo-status-update' 'repo-sync' 'repo-tree' 'repo-triggers' 'repo-update' 'report' 'run' 'search' 'service-clean' 'service-config' 'service-config-validate' 'service-key-import' 'service-repositories' 'service-run' 'service-setup' 'service-shell' 'service-tree-migrate' 'setup' 'shell' 'sign' 'status' 'status-update' 'sync' 'update' 'user-add' 'user-list' 'user-remove' 'version' 'web' 'web-reload')
+_shtab_ahriman_subparsers=(add aur-search check clean config config-validate copy daemon help help-commands-unsafe help-updates help-version init key-import package-add package-archives package-changes package-changes-remove package-copy package-hold package-pkgbuild package-pkgbuild-remove package-remove package-rollback package-status package-status-remove package-status-update package-unhold package-update patch-add patch-list patch-remove patch-set-add rebuild remove remove-unknown repo-backup repo-check repo-clean repo-config repo-config-validate repo-create-keyring repo-create-mirrorlist repo-daemon repo-init repo-rebuild repo-remove-unknown repo-report repo-restore repo-setup repo-sign repo-statistics repo-status-update repo-sync repo-tree repo-triggers repo-update report run search service-clean service-config service-config-validate service-key-import service-repositories service-run service-setup service-shell service-tree-migrate setup shell sign status status-update sync update user-add user-list user-remove version web web-reload)
 
-_shtab_ahriman_option_strings=('-h' '--help' '-a' '--architecture' '-c' '--configuration' '--force' '-l' '--lock' '--log-handler' '-q' '--quiet' '--report' '--no-report' '-r' '--repository' '--unsafe' '-V' '--version' '--wait-timeout')
+_shtab_ahriman_add_option_strings=(-h --help --changes --no-changes --dependencies --no-dependencies -e --exit-code --increment --no-increment -n --now -s --source -u --username -v --variable -y --refresh)
-_shtab_ahriman_add_option_strings=('-h' '--help' '--changes' '--no-changes' '--dependencies' '--no-dependencies' '-e' '--exit-code' '--increment' '--no-increment' '-n' '--now' '-s' '--source' '-u' '--username' '-v' '--variable' '-y' '--refresh')
+_shtab_ahriman_aur_search_option_strings=(-h --help -e --exit-code --info --no-info --sort-by)
-_shtab_ahriman_aur_search_option_strings=('-h' '--help' '-e' '--exit-code' '--info' '--no-info' '--sort-by')
+_shtab_ahriman_check_option_strings=(-h --help --changes --no-changes --check-files --no-check-files -e --exit-code --vcs --no-vcs -y --refresh)
-_shtab_ahriman_check_option_strings=('-h' '--help' '--changes' '--no-changes' '--check-files' '--no-check-files' '-e' '--exit-code' '--vcs' '--no-vcs' '-y' '--refresh')
+_shtab_ahriman_clean_option_strings=(-h --help --cache --no-cache --chroot --no-chroot --manual --no-manual --packages --no-packages --pacman --no-pacman)
-_shtab_ahriman_clean_option_strings=('-h' '--help' '--cache' '--no-cache' '--chroot' '--no-chroot' '--manual' '--no-manual' '--packages' '--no-packages' '--pacman' '--no-pacman')
+_shtab_ahriman_config_option_strings=(-h --help --info --no-info --secure --no-secure)
-_shtab_ahriman_config_option_strings=('-h' '--help' '--info' '--no-info' '--secure' '--no-secure')
+_shtab_ahriman_config_validate_option_strings=(-h --help -e --exit-code)
-_shtab_ahriman_config_validate_option_strings=('-h' '--help' '-e' '--exit-code')
+_shtab_ahriman_copy_option_strings=(-h --help -e --exit-code --remove)
-_shtab_ahriman_copy_option_strings=('-h' '--help' '-e' '--exit-code' '--remove')
+_shtab_ahriman_daemon_option_strings=(-h --help -i --interval --aur --no-aur --changes --no-changes --check-files --no-check-files --dependencies --no-dependencies --dry-run --increment --no-increment --local --no-local --manual --no-manual --partitions --no-partitions -u --username --vcs --no-vcs -y --refresh)
-_shtab_ahriman_daemon_option_strings=('-h' '--help' '-i' '--interval' '--aur' '--no-aur' '--changes' '--no-changes' '--check-files' '--no-check-files' '--dependencies' '--no-dependencies' '--dry-run' '--increment' '--no-increment' '--local' '--no-local' '--manual' '--no-manual' '--partitions' '--no-partitions' '-u' '--username' '--vcs' '--no-vcs' '-y' '--refresh')
+_shtab_ahriman_help_option_strings=(-h --help)
-_shtab_ahriman_help_option_strings=('-h' '--help')
+_shtab_ahriman_help_commands_unsafe_option_strings=(-h --help)
-_shtab_ahriman_help_commands_unsafe_option_strings=('-h' '--help')
+_shtab_ahriman_help_updates_option_strings=(-h --help -e --exit-code)
-_shtab_ahriman_help_updates_option_strings=('-h' '--help' '-e' '--exit-code')
+_shtab_ahriman_help_version_option_strings=(-h --help)
-_shtab_ahriman_help_version_option_strings=('-h' '--help')
+_shtab_ahriman_init_option_strings=(-h --help --build-as-user --from-configuration --generate-salt --no-generate-salt --makeflags-jobs --no-makeflags-jobs --mirror --multilib --no-multilib --packager --server --sign-key --sign-target --web-port --web-unix-socket)
-_shtab_ahriman_init_option_strings=('-h' '--help' '--build-as-user' '--from-configuration' '--generate-salt' '--no-generate-salt' '--makeflags-jobs' '--no-makeflags-jobs' '--mirror' '--multilib' '--no-multilib' '--packager' '--server' '--sign-key' '--sign-target' '--web-port' '--web-unix-socket')
+_shtab_ahriman_key_import_option_strings=(-h --help --key-server)
-_shtab_ahriman_key_import_option_strings=('-h' '--help' '--key-server')
+_shtab_ahriman_package_add_option_strings=(-h --help --changes --no-changes --dependencies --no-dependencies -e --exit-code --increment --no-increment -n --now -s --source -u --username -v --variable -y --refresh)
-_shtab_ahriman_package_add_option_strings=('-h' '--help' '--changes' '--no-changes' '--dependencies' '--no-dependencies' '-e' '--exit-code' '--increment' '--no-increment' '-n' '--now' '-s' '--source' '-u' '--username' '-v' '--variable' '-y' '--refresh')
+_shtab_ahriman_package_archives_option_strings=(-h --help -e --exit-code --info --no-info)
-_shtab_ahriman_package_archives_option_strings=('-h' '--help' '-e' '--exit-code' '--info' '--no-info')
+_shtab_ahriman_package_changes_option_strings=(-h --help -e --exit-code)
-_shtab_ahriman_package_changes_option_strings=('-h' '--help' '-e' '--exit-code')
+_shtab_ahriman_package_changes_remove_option_strings=(-h --help)
-_shtab_ahriman_package_changes_remove_option_strings=('-h' '--help')
+_shtab_ahriman_package_copy_option_strings=(-h --help -e --exit-code --remove)
-_shtab_ahriman_package_copy_option_strings=('-h' '--help' '-e' '--exit-code' '--remove')
+_shtab_ahriman_package_hold_option_strings=(-h --help)
-_shtab_ahriman_package_hold_option_strings=('-h' '--help')
+_shtab_ahriman_package_pkgbuild_option_strings=(-h --help -e --exit-code)
-_shtab_ahriman_package_pkgbuild_option_strings=('-h' '--help' '-e' '--exit-code')
+_shtab_ahriman_package_pkgbuild_remove_option_strings=(-h --help)
-_shtab_ahriman_package_pkgbuild_remove_option_strings=('-h' '--help')
+_shtab_ahriman_package_remove_option_strings=(-h --help)
-_shtab_ahriman_package_remove_option_strings=('-h' '--help')
+_shtab_ahriman_package_rollback_option_strings=(-h --help --hold --no-hold -u --username)
-_shtab_ahriman_package_rollback_option_strings=('-h' '--help' '--hold' '--no-hold' '-u' '--username')
+_shtab_ahriman_package_status_option_strings=(-h --help --ahriman -e --exit-code --info --no-info -s --status)
-_shtab_ahriman_package_status_option_strings=('-h' '--help' '--ahriman' '-e' '--exit-code' '--info' '--no-info' '-s' '--status')
+_shtab_ahriman_package_status_remove_option_strings=(-h --help)
-_shtab_ahriman_package_status_remove_option_strings=('-h' '--help')
+_shtab_ahriman_package_status_update_option_strings=(-h --help -s --status)
-_shtab_ahriman_package_status_update_option_strings=('-h' '--help' '-s' '--status')
+_shtab_ahriman_package_unhold_option_strings=(-h --help)
-_shtab_ahriman_package_unhold_option_strings=('-h' '--help')
+_shtab_ahriman_package_update_option_strings=(-h --help --changes --no-changes --dependencies --no-dependencies -e --exit-code --increment --no-increment -n --now -s --source -u --username -v --variable -y --refresh)
-_shtab_ahriman_package_update_option_strings=('-h' '--help' '--changes' '--no-changes' '--dependencies' '--no-dependencies' '-e' '--exit-code' '--increment' '--no-increment' '-n' '--now' '-s' '--source' '-u' '--username' '-v' '--variable' '-y' '--refresh')
+_shtab_ahriman_patch_add_option_strings=(-h --help)
-_shtab_ahriman_patch_add_option_strings=('-h' '--help')
+_shtab_ahriman_patch_list_option_strings=(-h --help -e --exit-code -v --variable)
-_shtab_ahriman_patch_list_option_strings=('-h' '--help' '-e' '--exit-code' '-v' '--variable')
+_shtab_ahriman_patch_remove_option_strings=(-h --help -v --variable)
-_shtab_ahriman_patch_remove_option_strings=('-h' '--help' '-v' '--variable')
+_shtab_ahriman_patch_set_add_option_strings=(-h --help -t --track)
-_shtab_ahriman_patch_set_add_option_strings=('-h' '--help' '-t' '--track')
+_shtab_ahriman_rebuild_option_strings=(-h --help --depends-on --dry-run --from-database --increment --no-increment -e --exit-code -s --status -u --username)
-_shtab_ahriman_rebuild_option_strings=('-h' '--help' '--depends-on' '--dry-run' '--from-database' '--increment' '--no-increment' '-e' '--exit-code' '-s' '--status' '-u' '--username')
+_shtab_ahriman_remove_option_strings=(-h --help)
-_shtab_ahriman_remove_option_strings=('-h' '--help')
+_shtab_ahriman_remove_unknown_option_strings=(-h --help --dry-run)
-_shtab_ahriman_remove_unknown_option_strings=('-h' '--help' '--dry-run')
+_shtab_ahriman_repo_backup_option_strings=(-h --help)
-_shtab_ahriman_repo_backup_option_strings=('-h' '--help')
+_shtab_ahriman_repo_check_option_strings=(-h --help --changes --no-changes --check-files --no-check-files -e --exit-code --vcs --no-vcs -y --refresh)
-_shtab_ahriman_repo_check_option_strings=('-h' '--help' '--changes' '--no-changes' '--check-files' '--no-check-files' '-e' '--exit-code' '--vcs' '--no-vcs' '-y' '--refresh')
+_shtab_ahriman_repo_clean_option_strings=(-h --help --cache --no-cache --chroot --no-chroot --manual --no-manual --packages --no-packages --pacman --no-pacman)
-_shtab_ahriman_repo_clean_option_strings=('-h' '--help' '--cache' '--no-cache' '--chroot' '--no-chroot' '--manual' '--no-manual' '--packages' '--no-packages' '--pacman' '--no-pacman')
+_shtab_ahriman_repo_config_option_strings=(-h --help --info --no-info --secure --no-secure)
-_shtab_ahriman_repo_config_option_strings=('-h' '--help' '--info' '--no-info' '--secure' '--no-secure')
+_shtab_ahriman_repo_config_validate_option_strings=(-h --help -e --exit-code)
-_shtab_ahriman_repo_config_validate_option_strings=('-h' '--help' '-e' '--exit-code')
+_shtab_ahriman_repo_create_keyring_option_strings=(-h --help)
-_shtab_ahriman_repo_create_keyring_option_strings=('-h' '--help')
+_shtab_ahriman_repo_create_mirrorlist_option_strings=(-h --help)
-_shtab_ahriman_repo_create_mirrorlist_option_strings=('-h' '--help')
+_shtab_ahriman_repo_daemon_option_strings=(-h --help -i --interval --aur --no-aur --changes --no-changes --check-files --no-check-files --dependencies --no-dependencies --dry-run --increment --no-increment --local --no-local --manual --no-manual --partitions --no-partitions -u --username --vcs --no-vcs -y --refresh)
-_shtab_ahriman_repo_daemon_option_strings=('-h' '--help' '-i' '--interval' '--aur' '--no-aur' '--changes' '--no-changes' '--check-files' '--no-check-files' '--dependencies' '--no-dependencies' '--dry-run' '--increment' '--no-increment' '--local' '--no-local' '--manual' '--no-manual' '--partitions' '--no-partitions' '-u' '--username' '--vcs' '--no-vcs' '-y' '--refresh')
+_shtab_ahriman_repo_init_option_strings=(-h --help --build-as-user --from-configuration --generate-salt --no-generate-salt --makeflags-jobs --no-makeflags-jobs --mirror --multilib --no-multilib --packager --server --sign-key --sign-target --web-port --web-unix-socket)
-_shtab_ahriman_repo_init_option_strings=('-h' '--help' '--build-as-user' '--from-configuration' '--generate-salt' '--no-generate-salt' '--makeflags-jobs' '--no-makeflags-jobs' '--mirror' '--multilib' '--no-multilib' '--packager' '--server' '--sign-key' '--sign-target' '--web-port' '--web-unix-socket')
+_shtab_ahriman_repo_rebuild_option_strings=(-h --help --depends-on --dry-run --from-database --increment --no-increment -e --exit-code -s --status -u --username)
-_shtab_ahriman_repo_rebuild_option_strings=('-h' '--help' '--depends-on' '--dry-run' '--from-database' '--increment' '--no-increment' '-e' '--exit-code' '-s' '--status' '-u' '--username')
+_shtab_ahriman_repo_remove_unknown_option_strings=(-h --help --dry-run)
-_shtab_ahriman_repo_remove_unknown_option_strings=('-h' '--help' '--dry-run')
+_shtab_ahriman_repo_report_option_strings=(-h --help)
-_shtab_ahriman_repo_report_option_strings=('-h' '--help')
+_shtab_ahriman_repo_restore_option_strings=(-h --help -o --output)
-_shtab_ahriman_repo_restore_option_strings=('-h' '--help' '-o' '--output')
+_shtab_ahriman_repo_setup_option_strings=(-h --help --build-as-user --from-configuration --generate-salt --no-generate-salt --makeflags-jobs --no-makeflags-jobs --mirror --multilib --no-multilib --packager --server --sign-key --sign-target --web-port --web-unix-socket)
-_shtab_ahriman_repo_setup_option_strings=('-h' '--help' '--build-as-user' '--from-configuration' '--generate-salt' '--no-generate-salt' '--makeflags-jobs' '--no-makeflags-jobs' '--mirror' '--multilib' '--no-multilib' '--packager' '--server' '--sign-key' '--sign-target' '--web-port' '--web-unix-socket')
+_shtab_ahriman_repo_sign_option_strings=(-h --help)
-_shtab_ahriman_repo_sign_option_strings=('-h' '--help')
+_shtab_ahriman_repo_statistics_option_strings=(-h --help --chart -e --event --from-date --limit --offset --to-date)
-_shtab_ahriman_repo_statistics_option_strings=('-h' '--help' '--chart' '-e' '--event' '--from-date' '--limit' '--offset' '--to-date')
+_shtab_ahriman_repo_status_update_option_strings=(-h --help -s --status)
-_shtab_ahriman_repo_status_update_option_strings=('-h' '--help' '-s' '--status')
+_shtab_ahriman_repo_sync_option_strings=(-h --help)
-_shtab_ahriman_repo_sync_option_strings=('-h' '--help')
+_shtab_ahriman_repo_tree_option_strings=(-h --help -p --partitions)
-_shtab_ahriman_repo_tree_option_strings=('-h' '--help' '-p' '--partitions')
+_shtab_ahriman_repo_triggers_option_strings=(-h --help)
-_shtab_ahriman_repo_triggers_option_strings=('-h' '--help')
+_shtab_ahriman_repo_update_option_strings=(-h --help --aur --no-aur --changes --no-changes --check-files --no-check-files --dependencies --no-dependencies --dry-run -e --exit-code --increment --no-increment --local --no-local --manual --no-manual -u --username --vcs --no-vcs -y --refresh)
-_shtab_ahriman_repo_update_option_strings=('-h' '--help' '--aur' '--no-aur' '--changes' '--no-changes' '--check-files' '--no-check-files' '--dependencies' '--no-dependencies' '--dry-run' '-e' '--exit-code' '--increment' '--no-increment' '--local' '--no-local' '--manual' '--no-manual' '-u' '--username' '--vcs' '--no-vcs' '-y' '--refresh')
+_shtab_ahriman_report_option_strings=(-h --help)
-_shtab_ahriman_report_option_strings=('-h' '--help')
+_shtab_ahriman_run_option_strings=(-h --help)
-_shtab_ahriman_run_option_strings=('-h' '--help')
+_shtab_ahriman_search_option_strings=(-h --help -e --exit-code --info --no-info --sort-by)
-_shtab_ahriman_search_option_strings=('-h' '--help' '-e' '--exit-code' '--info' '--no-info' '--sort-by')
+_shtab_ahriman_service_clean_option_strings=(-h --help --cache --no-cache --chroot --no-chroot --manual --no-manual --packages --no-packages --pacman --no-pacman)
-_shtab_ahriman_service_clean_option_strings=('-h' '--help' '--cache' '--no-cache' '--chroot' '--no-chroot' '--manual' '--no-manual' '--packages' '--no-packages' '--pacman' '--no-pacman')
+_shtab_ahriman_service_config_option_strings=(-h --help --info --no-info --secure --no-secure)
-_shtab_ahriman_service_config_option_strings=('-h' '--help' '--info' '--no-info' '--secure' '--no-secure')
+_shtab_ahriman_service_config_validate_option_strings=(-h --help -e --exit-code)
-_shtab_ahriman_service_config_validate_option_strings=('-h' '--help' '-e' '--exit-code')
+_shtab_ahriman_service_key_import_option_strings=(-h --help --key-server)
-_shtab_ahriman_service_key_import_option_strings=('-h' '--help' '--key-server')
+_shtab_ahriman_service_repositories_option_strings=(-h --help --id-only --no-id-only)
-_shtab_ahriman_service_repositories_option_strings=('-h' '--help' '--id-only' '--no-id-only')
+_shtab_ahriman_service_run_option_strings=(-h --help)
-_shtab_ahriman_service_run_option_strings=('-h' '--help')
+_shtab_ahriman_service_setup_option_strings=(-h --help --build-as-user --from-configuration --generate-salt --no-generate-salt --makeflags-jobs --no-makeflags-jobs --mirror --multilib --no-multilib --packager --server --sign-key --sign-target --web-port --web-unix-socket)
-_shtab_ahriman_service_setup_option_strings=('-h' '--help' '--build-as-user' '--from-configuration' '--generate-salt' '--no-generate-salt' '--makeflags-jobs' '--no-makeflags-jobs' '--mirror' '--multilib' '--no-multilib' '--packager' '--server' '--sign-key' '--sign-target' '--web-port' '--web-unix-socket')
+_shtab_ahriman_service_shell_option_strings=(-h --help -o --output)
-_shtab_ahriman_service_shell_option_strings=('-h' '--help' '-o' '--output')
+_shtab_ahriman_service_tree_migrate_option_strings=(-h --help)
-_shtab_ahriman_service_tree_migrate_option_strings=('-h' '--help')
+_shtab_ahriman_setup_option_strings=(-h --help --build-as-user --from-configuration --generate-salt --no-generate-salt --makeflags-jobs --no-makeflags-jobs --mirror --multilib --no-multilib --packager --server --sign-key --sign-target --web-port --web-unix-socket)
-_shtab_ahriman_setup_option_strings=('-h' '--help' '--build-as-user' '--from-configuration' '--generate-salt' '--no-generate-salt' '--makeflags-jobs' '--no-makeflags-jobs' '--mirror' '--multilib' '--no-multilib' '--packager' '--server' '--sign-key' '--sign-target' '--web-port' '--web-unix-socket')
+_shtab_ahriman_shell_option_strings=(-h --help -o --output)
-_shtab_ahriman_shell_option_strings=('-h' '--help' '-o' '--output')
+_shtab_ahriman_sign_option_strings=(-h --help)
-_shtab_ahriman_sign_option_strings=('-h' '--help')
+_shtab_ahriman_status_option_strings=(-h --help --ahriman -e --exit-code --info --no-info -s --status)
-_shtab_ahriman_status_option_strings=('-h' '--help' '--ahriman' '-e' '--exit-code' '--info' '--no-info' '-s' '--status')
+_shtab_ahriman_status_update_option_strings=(-h --help -s --status)
-_shtab_ahriman_status_update_option_strings=('-h' '--help' '-s' '--status')
+_shtab_ahriman_sync_option_strings=(-h --help)
-_shtab_ahriman_sync_option_strings=('-h' '--help')
+_shtab_ahriman_update_option_strings=(-h --help --aur --no-aur --changes --no-changes --check-files --no-check-files --dependencies --no-dependencies --dry-run -e --exit-code --increment --no-increment --local --no-local --manual --no-manual -u --username --vcs --no-vcs -y --refresh)
-_shtab_ahriman_update_option_strings=('-h' '--help' '--aur' '--no-aur' '--changes' '--no-changes' '--check-files' '--no-check-files' '--dependencies' '--no-dependencies' '--dry-run' '-e' '--exit-code' '--increment' '--no-increment' '--local' '--no-local' '--manual' '--no-manual' '-u' '--username' '--vcs' '--no-vcs' '-y' '--refresh')
+_shtab_ahriman_user_add_option_strings=(-h --help --key --packager -p --password -R --role)
-_shtab_ahriman_user_add_option_strings=('-h' '--help' '--key' '--packager' '-p' '--password' '-R' '--role')
+_shtab_ahriman_user_list_option_strings=(-h --help -e --exit-code -R --role)
-_shtab_ahriman_user_list_option_strings=('-h' '--help' '-e' '--exit-code' '-R' '--role')
+_shtab_ahriman_user_remove_option_strings=(-h --help)
-_shtab_ahriman_user_remove_option_strings=('-h' '--help')
+_shtab_ahriman_version_option_strings=(-h --help)
-_shtab_ahriman_version_option_strings=('-h' '--help')
+_shtab_ahriman_web_option_strings=(-h --help)
-_shtab_ahriman_web_option_strings=('-h' '--help')
+_shtab_ahriman_web_reload_option_strings=(-h --help)
-_shtab_ahriman_web_reload_option_strings=('-h' '--help')
+_shtab_ahriman_option_strings=(-h --help -a --architecture -c --configuration --force -l --lock --log-handler -q --quiet --report --no-report -r --repository --unsafe -V --version --wait-timeout)
 
 
 
-_shtab_ahriman_pos_0_choices=('add' 'aur-search' 'check' 'clean' 'config' 'config-validate' 'copy' 'daemon' 'help' 'help-commands-unsafe' 'help-updates' 'help-version' 'init' 'key-import' 'package-add' 'package-archives' 'package-changes' 'package-changes-remove' 'package-copy' 'package-hold' 'package-pkgbuild' 'package-pkgbuild-remove' 'package-remove' 'package-rollback' 'package-status' 'package-status-remove' 'package-status-update' 'package-unhold' 'package-update' 'patch-add' 'patch-list' 'patch-remove' 'patch-set-add' 'rebuild' 'remove' 'remove-unknown' 'repo-backup' 'repo-check' 'repo-clean' 'repo-config' 'repo-config-validate' 'repo-create-keyring' 'repo-create-mirrorlist' 'repo-daemon' 'repo-init' 'repo-rebuild' 'repo-remove-unknown' 'repo-report' 'repo-restore' 'repo-setup' 'repo-sign' 'repo-statistics' 'repo-status-update' 'repo-sync' 'repo-tree' 'repo-triggers' 'repo-update' 'report' 'run' 'search' 'service-clean' 'service-config' 'service-config-validate' 'service-key-import' 'service-repositories' 'service-run' 'service-setup' 'service-shell' 'service-tree-migrate' 'setup' 'shell' 'sign' 'status' 'status-update' 'sync' 'update' 'user-add' 'user-list' 'user-remove' 'version' 'web' 'web-reload')
+_shtab_ahriman_add__s_choices=(auto archive aur directory local remote repository)
-_shtab_ahriman___log_handler_choices=('console' 'syslog' 'journald')
+_shtab_ahriman_add___source_choices=(auto archive aur directory local remote repository)
-_shtab_ahriman_add__s_choices=('auto' 'archive' 'aur' 'directory' 'local' 'remote' 'repository')
+_shtab_ahriman_aur_search___sort_by_choices=(description first_submitted id last_modified maintainer name num_votes out_of_date package_base package_base_id popularity repository submitter url url_path version)
-_shtab_ahriman_add___source_choices=('auto' 'archive' 'aur' 'directory' 'local' 'remote' 'repository')
+_shtab_ahriman_init___sign_target_choices=(disabled packages repository)
-_shtab_ahriman_aur_search___sort_by_choices=('description' 'first_submitted' 'id' 'last_modified' 'maintainer' 'name' 'num_votes' 'out_of_date' 'package_base' 'package_base_id' 'popularity' 'repository' 'submitter' 'url' 'url_path' 'version')
+_shtab_ahriman_package_add__s_choices=(auto archive aur directory local remote repository)
-_shtab_ahriman_init___sign_target_choices=('disabled' 'packages' 'repository')
+_shtab_ahriman_package_add___source_choices=(auto archive aur directory local remote repository)
-_shtab_ahriman_package_add__s_choices=('auto' 'archive' 'aur' 'directory' 'local' 'remote' 'repository')
+_shtab_ahriman_package_status__s_choices=(unknown pending building failed success)
-_shtab_ahriman_package_add___source_choices=('auto' 'archive' 'aur' 'directory' 'local' 'remote' 'repository')
+_shtab_ahriman_package_status___status_choices=(unknown pending building failed success)
-_shtab_ahriman_package_status__s_choices=('unknown' 'pending' 'building' 'failed' 'success')
+_shtab_ahriman_package_status_update__s_choices=(unknown pending building failed success)
-_shtab_ahriman_package_status___status_choices=('unknown' 'pending' 'building' 'failed' 'success')
+_shtab_ahriman_package_status_update___status_choices=(unknown pending building failed success)
-_shtab_ahriman_package_status_update__s_choices=('unknown' 'pending' 'building' 'failed' 'success')
+_shtab_ahriman_package_update__s_choices=(auto archive aur directory local remote repository)
-_shtab_ahriman_package_status_update___status_choices=('unknown' 'pending' 'building' 'failed' 'success')
+_shtab_ahriman_package_update___source_choices=(auto archive aur directory local remote repository)
-_shtab_ahriman_package_update__s_choices=('auto' 'archive' 'aur' 'directory' 'local' 'remote' 'repository')
+_shtab_ahriman_rebuild__s_choices=(unknown pending building failed success)
-_shtab_ahriman_package_update___source_choices=('auto' 'archive' 'aur' 'directory' 'local' 'remote' 'repository')
+_shtab_ahriman_rebuild___status_choices=(unknown pending building failed success)
-_shtab_ahriman_rebuild__s_choices=('unknown' 'pending' 'building' 'failed' 'success')
+_shtab_ahriman_repo_init___sign_target_choices=(disabled packages repository)
-_shtab_ahriman_rebuild___status_choices=('unknown' 'pending' 'building' 'failed' 'success')
+_shtab_ahriman_repo_rebuild__s_choices=(unknown pending building failed success)
-_shtab_ahriman_repo_init___sign_target_choices=('disabled' 'packages' 'repository')
+_shtab_ahriman_repo_rebuild___status_choices=(unknown pending building failed success)
-_shtab_ahriman_repo_rebuild__s_choices=('unknown' 'pending' 'building' 'failed' 'success')
+_shtab_ahriman_repo_setup___sign_target_choices=(disabled packages repository)
-_shtab_ahriman_repo_rebuild___status_choices=('unknown' 'pending' 'building' 'failed' 'success')
+_shtab_ahriman_repo_statistics__e_choices=(build-log package-held package-outdated package-removed package-status-changed package-update-failed package-updated service-status-changed)
-_shtab_ahriman_repo_setup___sign_target_choices=('disabled' 'packages' 'repository')
+_shtab_ahriman_repo_statistics___event_choices=(build-log package-held package-outdated package-removed package-status-changed package-update-failed package-updated service-status-changed)
-_shtab_ahriman_repo_statistics__e_choices=('build-log' 'package-held' 'package-outdated' 'package-removed' 'package-status-changed' 'package-update-failed' 'package-updated' 'service-status-changed')
+_shtab_ahriman_repo_status_update__s_choices=(unknown pending building failed success)
-_shtab_ahriman_repo_statistics___event_choices=('build-log' 'package-held' 'package-outdated' 'package-removed' 'package-status-changed' 'package-update-failed' 'package-updated' 'service-status-changed')
+_shtab_ahriman_repo_status_update___status_choices=(unknown pending building failed success)
-_shtab_ahriman_repo_status_update__s_choices=('unknown' 'pending' 'building' 'failed' 'success')
+_shtab_ahriman_search___sort_by_choices=(description first_submitted id last_modified maintainer name num_votes out_of_date package_base package_base_id popularity repository submitter url url_path version)
-_shtab_ahriman_repo_status_update___status_choices=('unknown' 'pending' 'building' 'failed' 'success')
+_shtab_ahriman_service_setup___sign_target_choices=(disabled packages repository)
-_shtab_ahriman_search___sort_by_choices=('description' 'first_submitted' 'id' 'last_modified' 'maintainer' 'name' 'num_votes' 'out_of_date' 'package_base' 'package_base_id' 'popularity' 'repository' 'submitter' 'url' 'url_path' 'version')
+_shtab_ahriman_setup___sign_target_choices=(disabled packages repository)
-_shtab_ahriman_service_setup___sign_target_choices=('disabled' 'packages' 'repository')
+_shtab_ahriman_status__s_choices=(unknown pending building failed success)
-_shtab_ahriman_setup___sign_target_choices=('disabled' 'packages' 'repository')
+_shtab_ahriman_status___status_choices=(unknown pending building failed success)
-_shtab_ahriman_status__s_choices=('unknown' 'pending' 'building' 'failed' 'success')
+_shtab_ahriman_status_update__s_choices=(unknown pending building failed success)
-_shtab_ahriman_status___status_choices=('unknown' 'pending' 'building' 'failed' 'success')
+_shtab_ahriman_status_update___status_choices=(unknown pending building failed success)
-_shtab_ahriman_status_update__s_choices=('unknown' 'pending' 'building' 'failed' 'success')
+_shtab_ahriman_user_add__R_choices=(unauthorized read reporter full)
-_shtab_ahriman_status_update___status_choices=('unknown' 'pending' 'building' 'failed' 'success')
+_shtab_ahriman_user_add___role_choices=(unauthorized read reporter full)
-_shtab_ahriman_user_add__R_choices=('unauthorized' 'read' 'reporter' 'full')
+_shtab_ahriman_user_list__R_choices=(unauthorized read reporter full)
-_shtab_ahriman_user_add___role_choices=('unauthorized' 'read' 'reporter' 'full')
+_shtab_ahriman_user_list___role_choices=(unauthorized read reporter full)
-_shtab_ahriman_user_list__R_choices=('unauthorized' 'read' 'reporter' 'full')
+_shtab_ahriman_pos_0_choices=(add aur-search check clean config config-validate copy daemon help help-commands-unsafe help-updates help-version init key-import package-add package-archives package-changes package-changes-remove package-copy package-hold package-pkgbuild package-pkgbuild-remove package-remove package-rollback package-status package-status-remove package-status-update package-unhold package-update patch-add patch-list patch-remove patch-set-add rebuild remove remove-unknown repo-backup repo-check repo-clean repo-config repo-config-validate repo-create-keyring repo-create-mirrorlist repo-daemon repo-init repo-rebuild repo-remove-unknown repo-report repo-restore repo-setup repo-sign repo-statistics repo-status-update repo-sync repo-tree repo-triggers repo-update report run search service-clean service-config service-config-validate service-key-import service-repositories service-run service-setup service-shell service-tree-migrate setup shell sign status status-update sync update user-add user-list user-remove version web web-reload)
-_shtab_ahriman_user_list___role_choices=('unauthorized' 'read' 'reporter' 'full')
+_shtab_ahriman___log_handler_choices=(console syslog journald)
 
-_shtab_ahriman_pos_0_nargs=A...
-_shtab_ahriman__h_nargs=0
-_shtab_ahriman___help_nargs=0
-_shtab_ahriman___force_nargs=0
-_shtab_ahriman__q_nargs=0
-_shtab_ahriman___quiet_nargs=0
-_shtab_ahriman___report_nargs=0
-_shtab_ahriman___no_report_nargs=0
-_shtab_ahriman___unsafe_nargs=0
-_shtab_ahriman__V_nargs=0
-_shtab_ahriman___version_nargs=0
 _shtab_ahriman_add_pos_0_nargs=+
 _shtab_ahriman_add__h_nargs=0
 _shtab_ahriman_add___help_nargs=0
@@ -157,7 +151,7 @@ _shtab_ahriman_aur_search__e_nargs=0
 _shtab_ahriman_aur_search___exit_code_nargs=0
 _shtab_ahriman_aur_search___info_nargs=0
 _shtab_ahriman_aur_search___no_info_nargs=0
-_shtab_ahriman_check_pos_0_nargs=*
+_shtab_ahriman_check_pos_0_nargs='*'
 _shtab_ahriman_check__h_nargs=0
 _shtab_ahriman_check___help_nargs=0
 _shtab_ahriman_check___changes_nargs=0
@@ -223,7 +217,7 @@ _shtab_ahriman_daemon__y_nargs=0
 _shtab_ahriman_daemon___refresh_nargs=0
 _shtab_ahriman_help__h_nargs=0
 _shtab_ahriman_help___help_nargs=0
-_shtab_ahriman_help_commands_unsafe_pos_0_nargs=*
+_shtab_ahriman_help_commands_unsafe_pos_0_nargs='*'
 _shtab_ahriman_help_commands_unsafe__h_nargs=0
 _shtab_ahriman_help_commands_unsafe___help_nargs=0
 _shtab_ahriman_help_updates__h_nargs=0
@@ -291,7 +285,7 @@ _shtab_ahriman_package_rollback__h_nargs=0
 _shtab_ahriman_package_rollback___help_nargs=0
 _shtab_ahriman_package_rollback___hold_nargs=0
 _shtab_ahriman_package_rollback___no_hold_nargs=0
-_shtab_ahriman_package_status_pos_0_nargs=*
+_shtab_ahriman_package_status_pos_0_nargs='*'
 _shtab_ahriman_package_status__h_nargs=0
 _shtab_ahriman_package_status___help_nargs=0
 _shtab_ahriman_package_status___ahriman_nargs=0
@@ -302,7 +296,7 @@ _shtab_ahriman_package_status___no_info_nargs=0
 _shtab_ahriman_package_status_remove_pos_0_nargs=+
 _shtab_ahriman_package_status_remove__h_nargs=0
 _shtab_ahriman_package_status_remove___help_nargs=0
-_shtab_ahriman_package_status_update_pos_0_nargs=*
+_shtab_ahriman_package_status_update_pos_0_nargs='*'
 _shtab_ahriman_package_status_update__h_nargs=0
 _shtab_ahriman_package_status_update___help_nargs=0
 _shtab_ahriman_package_unhold_pos_0_nargs=+
@@ -349,7 +343,7 @@ _shtab_ahriman_remove_unknown___help_nargs=0
 _shtab_ahriman_remove_unknown___dry_run_nargs=0
 _shtab_ahriman_repo_backup__h_nargs=0
 _shtab_ahriman_repo_backup___help_nargs=0
-_shtab_ahriman_repo_check_pos_0_nargs=*
+_shtab_ahriman_repo_check_pos_0_nargs='*'
 _shtab_ahriman_repo_check__h_nargs=0
 _shtab_ahriman_repo_check___help_nargs=0
 _shtab_ahriman_repo_check___changes_nargs=0
@@ -442,7 +436,7 @@ _shtab_ahriman_repo_setup___makeflags_jobs_nargs=0
 _shtab_ahriman_repo_setup___no_makeflags_jobs_nargs=0
 _shtab_ahriman_repo_setup___multilib_nargs=0
 _shtab_ahriman_repo_setup___no_multilib_nargs=0
-_shtab_ahriman_repo_sign_pos_0_nargs=*
+_shtab_ahriman_repo_sign_pos_0_nargs='*'
 _shtab_ahriman_repo_sign__h_nargs=0
 _shtab_ahriman_repo_sign___help_nargs=0
 _shtab_ahriman_repo_statistics__h_nargs=0
@@ -453,10 +447,10 @@ _shtab_ahriman_repo_sync__h_nargs=0
 _shtab_ahriman_repo_sync___help_nargs=0
 _shtab_ahriman_repo_tree__h_nargs=0
 _shtab_ahriman_repo_tree___help_nargs=0
-_shtab_ahriman_repo_triggers_pos_0_nargs=*
+_shtab_ahriman_repo_triggers_pos_0_nargs='*'
 _shtab_ahriman_repo_triggers__h_nargs=0
 _shtab_ahriman_repo_triggers___help_nargs=0
-_shtab_ahriman_repo_update_pos_0_nargs=*
+_shtab_ahriman_repo_update_pos_0_nargs='*'
 _shtab_ahriman_repo_update__h_nargs=0
 _shtab_ahriman_repo_update___help_nargs=0
 _shtab_ahriman_repo_update___aur_nargs=0
@@ -533,8 +527,6 @@ _shtab_ahriman_service_setup___multilib_nargs=0
 _shtab_ahriman_service_setup___no_multilib_nargs=0
 _shtab_ahriman_service_shell__h_nargs=0
 _shtab_ahriman_service_shell___help_nargs=0
-_shtab_ahriman_service_shell__v_nargs=0
-_shtab_ahriman_service_shell___verbose_nargs=0
 _shtab_ahriman_service_tree_migrate__h_nargs=0
 _shtab_ahriman_service_tree_migrate___help_nargs=0
 _shtab_ahriman_setup__h_nargs=0
@@ -547,12 +539,10 @@ _shtab_ahriman_setup___multilib_nargs=0
 _shtab_ahriman_setup___no_multilib_nargs=0
 _shtab_ahriman_shell__h_nargs=0
 _shtab_ahriman_shell___help_nargs=0
-_shtab_ahriman_shell__v_nargs=0
+_shtab_ahriman_sign_pos_0_nargs='*'
-_shtab_ahriman_shell___verbose_nargs=0
-_shtab_ahriman_sign_pos_0_nargs=*
 _shtab_ahriman_sign__h_nargs=0
 _shtab_ahriman_sign___help_nargs=0
-_shtab_ahriman_status_pos_0_nargs=*
+_shtab_ahriman_status_pos_0_nargs='*'
 _shtab_ahriman_status__h_nargs=0
 _shtab_ahriman_status___help_nargs=0
 _shtab_ahriman_status___ahriman_nargs=0
@@ -560,12 +550,12 @@ _shtab_ahriman_status__e_nargs=0
 _shtab_ahriman_status___exit_code_nargs=0
 _shtab_ahriman_status___info_nargs=0
 _shtab_ahriman_status___no_info_nargs=0
-_shtab_ahriman_status_update_pos_0_nargs=*
+_shtab_ahriman_status_update_pos_0_nargs='*'
 _shtab_ahriman_status_update__h_nargs=0
 _shtab_ahriman_status_update___help_nargs=0
 _shtab_ahriman_sync__h_nargs=0
 _shtab_ahriman_sync___help_nargs=0
-_shtab_ahriman_update_pos_0_nargs=*
+_shtab_ahriman_update_pos_0_nargs='*'
 _shtab_ahriman_update__h_nargs=0
 _shtab_ahriman_update___help_nargs=0
 _shtab_ahriman_update___aur_nargs=0
@@ -603,6 +593,17 @@ _shtab_ahriman_web__h_nargs=0
 _shtab_ahriman_web___help_nargs=0
 _shtab_ahriman_web_reload__h_nargs=0
 _shtab_ahriman_web_reload___help_nargs=0
+_shtab_ahriman_pos_0_nargs=A...
+_shtab_ahriman__h_nargs=0
+_shtab_ahriman___help_nargs=0
+_shtab_ahriman___force_nargs=0
+_shtab_ahriman__q_nargs=0
+_shtab_ahriman___quiet_nargs=0
+_shtab_ahriman___report_nargs=0
+_shtab_ahriman___no_report_nargs=0
+_shtab_ahriman___unsafe_nargs=0
+_shtab_ahriman__V_nargs=0
+_shtab_ahriman___version_nargs=0
 
 
 # $1=COMP_WORDS[1]
@@ -630,7 +631,7 @@ _set_parser_defaults() {
 
   completed_positional_actions=0
 
-  _set_new_action "pos_${completed_positional_actions}" true
+  _set_new_action "pos_$completed_positional_actions" true
 }
 
 # $1=action identifier
@@ -680,7 +681,7 @@ _shtab_ahriman() {
 
   local prefix=_shtab_ahriman
   local word_index=0
-  local pos_only=0 # "--" delimeter not encountered yet
+  local pos_only=0 # "--" delimiter not encountered yet
   _set_parser_defaults
   word_index=1
 
@@ -690,13 +691,13 @@ _shtab_ahriman() {
     local this_word="${COMP_WORDS[$word_index]}"
 
     if [[ $pos_only = 1 || " $this_word " != " -- " ]]; then
-      if [[ -n $sub_parsers && " ${sub_parsers[@]} " == *" ${this_word} "* ]]; then
+      if [[ -n $sub_parsers && " ${sub_parsers[@]} " == *" $this_word "* ]]; then
         # valid subcommand: add it to the prefix & reset the current action
         prefix="${prefix}_$(_shtab_replace_nonword $this_word)"
         _set_parser_defaults
       fi
 
-      if [[ " ${current_option_strings[@]} " == *" ${this_word} "* ]]; then
+      if [[ " ${current_option_strings[@]} " == *" $this_word "* ]]; then
         # a new action should be acquired (due to recognised option string or
         # no more input expected from current action);
         # the next positional action can fill in here
@@ -710,10 +711,10 @@ _shtab_ahriman() {
          (( $word_index + 1 - $current_action_args_start_index - $pos_only >= \
             $current_action_nargs )); then
         $current_action_is_positional && let "completed_positional_actions += 1"
-        _set_new_action "pos_${completed_positional_actions}" true
+        _set_new_action "pos_$completed_positional_actions" true
       fi
     else
-      pos_only=1 # "--" delimeter encountered
+      pos_only=1 # "--" delimiter encountered
     fi
 
     let "word_index+=1"
@@ -721,23 +722,32 @@ _shtab_ahriman() {
 
   # Generate the completions
 
-  if [[ $pos_only = 0 && "${completing_word}" == -* ]]; then
+  COMPREPLY=()
+  if [[ $pos_only = 0 && "$completing_word" == -* &&
+        ( -z "$current_action_compgen" || "$current_action_is_positional" = true ) ]]; then
     # optional argument started: use option strings
-    COMPREPLY=( $(compgen -W "${current_option_strings[*]}" -- "${completing_word}") )
+    while IFS= read -r line; do COMPREPLY+=("$line"); done < <(
-  elif [[ "${previous_word}" == ">" || "${previous_word}" == ">>" ||
+      compgen -W "${current_option_strings[*]}" -- "$completing_word")
-          "${previous_word}" =~ ^[12]">" || "${previous_word}" =~ ^[12]">>" ]]; then
+  elif [[ "$previous_word" =~ ^[0-9\&]*[\<\>]\>?$ ]]; then
     # handle redirection operators
-    COMPREPLY=( $(compgen -f -- "${completing_word}") )
+    compopt -o filenames 2>/dev/null || : # bash>=4
+    while IFS= read -r line; do COMPREPLY+=("$line"); done < <(compgen -f -- "$completing_word")
   else
     # use choices & compgen
-    local IFS=$'\n' # items may contain spaces, so delimit using newline
+    local action_compgen_word="$completing_word"
-    COMPREPLY=( $([ -n "${current_action_compgen}" ] \
+    # handle tab-completing in the middle of a line (#248 <- #116)
-                  && "${current_action_compgen}" "${completing_word}") )
+    [[ -n "$current_action_compgen" && "$completing_word" == -* ]] && action_compgen_word=""
-    unset IFS
+    [ -n "$current_action_compgen" ] && {
-    COMPREPLY+=( $(compgen -W "${current_action_choices[*]}" -- "${completing_word}") )
+      [[ "$current_action_compgen" =~ _(file|dir|glob|FILE|DIR|GLOB)|File|Dir|Glob ]] &&
+        compopt -o filenames 2>/dev/null || : # bash>=4
+      while IFS= read -r line; do COMPREPLY+=("$line"); done < <(
+        "$current_action_compgen" "$action_compgen_word")
+    }
+    while IFS= read -r line; do COMPREPLY+=("$line"); done < <(
+      compgen -W "${current_action_choices[*]}" -- "$completing_word")
   fi
 
   return 0
 }
 
-complete -o filenames -F _shtab_ahriman ahriman
+complete -F _shtab_ahriman ahriman

ahriman-core/package/share/man/man1/ahriman.1

@@ -1,4 +1,4 @@
-.TH AHRIMAN "1" "2026\-07\-21" "ahriman 2.21.1" "ArcH linux ReposItory MANager"
+.TH AHRIMAN "1" "2026\-10\-13" "ahriman 2.22.2" "ArcH linux ReposItory MANager"
 .SH NAME
 ahriman \- ArcH linux ReposItory MANager
 .SH SYNOPSIS
@@ -990,7 +990,7 @@ usage: ahriman service\-setup [\-h] [\-\-build\-as\-user BUILD_AS_USER] [\-\-fro
                              [\-\-sign\-key SIGN_KEY] [\-\-sign\-target {disabled,packages,repository}] [\-\-web\-port WEB_PORT]
                              [\-\-web\-unix\-socket WEB_UNIX_SOCKET]
 
-create initial service configuration, requires root
+create initial service configuration as the repository owner
 
 .SH OPTIONS \fI\,'ahriman service\-setup'\/\fR
 .TP

ahriman-core/package/share/zsh/site-functions/_ahriman

@@ -1,92 +1,97 @@
 #compdef ahriman
 
-# AUTOMATICALLY GENERATED by `shtab`
+# AUTOMATICALLY GENERATED by https://github.com/tqdm/shtab
+# Usage:
+# 1) Copy this to a file named _ahriman (e.g. ~/.local/share/zsh_completion/_ahriman).
+# 2) Add the following line to your .zshrc:
+#    fpath=(~/.local/share/zsh_completion $fpath)
+# See also: https://github.com/zsh-users/zsh-completions/blob/master/zsh-completions-howto.org
 
 
 _shtab_ahriman_commands() {
   local _commands=(
-    "add:add existing or new package to the build queue"
+    add:'add existing or new package to the build queue'
-    "aur-search:search for package in AUR using API"
+    aur-search:'search for package in AUR using API'
-    "check:check for packages updates. Same as repo-update --dry-run --no-manual"
+    check:'check for packages updates. Same as repo-update --dry-run --no-manual'
-    "clean:remove local caches"
+    clean:'remove local caches'
-    "config:dump configuration for the specified architecture"
+    config:'dump configuration for the specified architecture'
-    "config-validate:validate configuration and print found errors"
+    config-validate:'validate configuration and print found errors'
-    "copy:copy package and its metadata from another repository"
+    copy:'copy package and its metadata from another repository'
-    "daemon:start process which periodically will run update process"
+    daemon:'start process which periodically will run update process'
-    "help:show help message for application or command and exit"
+    help:'show help message for application or command and exit'
-    "help-commands-unsafe:list unsafe commands as defined in default args"
+    help-commands-unsafe:'list unsafe commands as defined in default args'
-    "help-updates:request AUR for current version and compare with current service version"
+    help-updates:'request AUR for current version and compare with current service version'
-    "help-version:print application and its dependencies versions"
+    help-version:'print application and its dependencies versions'
-    "init:create initial service configuration, requires root"
+    init:'create initial service configuration as the repository owner'
-    "key-import:import PGP key from public sources to the repository user"
+    key-import:'import PGP key from public sources to the repository user'
-    "package-add:add existing or new package to the build queue"
+    package-add:'add existing or new package to the build queue'
-    "package-archives:list available archive versions for the package"
+    package-archives:'list available archive versions for the package'
-    "package-changes:retrieve package changes stored in database"
+    package-changes:'retrieve package changes stored in database'
-    "package-changes-remove:remove the package changes stored remotely"
+    package-changes-remove:'remove the package changes stored remotely'
-    "package-copy:copy package and its metadata from another repository"
+    package-copy:'copy package and its metadata from another repository'
-    "package-hold:hold package from automatic updates"
+    package-hold:'hold package from automatic updates'
-    "package-pkgbuild:retrieve package PKGBUILD stored in database"
+    package-pkgbuild:'retrieve package PKGBUILD stored in database'
-    "package-pkgbuild-remove:remove the package PKGBUILD stored remotely"
+    package-pkgbuild-remove:'remove the package PKGBUILD stored remotely'
-    "package-remove:remove package from the repository"
+    package-remove:'remove package from the repository'
-    "package-rollback:rollback package to specified version from archives"
+    package-rollback:'rollback package to specified version from archives'
-    "package-status:request status of the package"
+    package-status:'request status of the package'
-    "package-status-remove:remove the package from the status page"
+    package-status-remove:'remove the package from the status page'
-    "package-status-update:update package status on the status page"
+    package-status-update:'update package status on the status page'
-    "package-unhold:remove package hold, allowing automatic updates"
+    package-unhold:'remove package hold, allowing automatic updates'
-    "package-update:add existing or new package to the build queue"
+    package-update:'add existing or new package to the build queue'
-    "patch-add:create or update patched PKGBUILD function or variable"
+    patch-add:'create or update patched PKGBUILD function or variable'
-    "patch-list:list available patches for the package"
+    patch-list:'list available patches for the package'
-    "patch-remove:remove patches for the package"
+    patch-remove:'remove patches for the package'
-    "patch-set-add:create or update source patches"
+    patch-set-add:'create or update source patches'
-    "rebuild:force rebuild whole repository"
+    rebuild:'force rebuild whole repository'
-    "remove:remove package from the repository"
+    remove:'remove package from the repository'
-    "remove-unknown:remove packages which are missing in AUR and do not have local PKGBUILDs"
+    remove-unknown:'remove packages which are missing in AUR and do not have local PKGBUILDs'
-    "repo-backup:backup repository settings and database"
+    repo-backup:'backup repository settings and database'
-    "repo-check:check for packages updates. Same as repo-update --dry-run --no-manual"
+    repo-check:'check for packages updates. Same as repo-update --dry-run --no-manual'
-    "repo-clean:remove local caches"
+    repo-clean:'remove local caches'
-    "repo-config:dump configuration for the specified architecture"
+    repo-config:'dump configuration for the specified architecture'
-    "repo-config-validate:validate configuration and print found errors"
+    repo-config-validate:'validate configuration and print found errors'
-    "repo-create-keyring:create package which contains list of trusted keys as set by configuration. Note, that this action will only create package, the package itself has to be built manually"
+    repo-create-keyring:'create package which contains list of trusted keys as set by configuration. Note, that this action will only create package, the package itself has to be built manually'
-    "repo-create-mirrorlist:create package which contains list of available mirrors as set by configuration. Note, that this action will only create package, the package itself has to be built manually"
+    repo-create-mirrorlist:'create package which contains list of available mirrors as set by configuration. Note, that this action will only create package, the package itself has to be built manually'
-    "repo-daemon:start process which periodically will run update process"
+    repo-daemon:'start process which periodically will run update process'
-    "repo-init:create initial service configuration, requires root"
+    repo-init:'create initial service configuration as the repository owner'
-    "repo-rebuild:force rebuild whole repository"
+    repo-rebuild:'force rebuild whole repository'
-    "repo-remove-unknown:remove packages which are missing in AUR and do not have local PKGBUILDs"
+    repo-remove-unknown:'remove packages which are missing in AUR and do not have local PKGBUILDs'
-    "repo-report:generate repository report according to current settings"
+    repo-report:'generate repository report according to current settings'
-    "repo-restore:restore settings and database"
+    repo-restore:'restore settings and database'
-    "repo-setup:create initial service configuration, requires root"
+    repo-setup:'create initial service configuration as the repository owner'
-    "repo-sign:(re-)sign packages and repository database according to current settings"
+    repo-sign:'(re-)sign packages and repository database according to current settings'
-    "repo-statistics:fetch repository statistics"
+    repo-statistics:'fetch repository statistics'
-    "repo-status-update:update repository status on the status page"
+    repo-status-update:'update repository status on the status page'
-    "repo-sync:sync repository files to remote server according to current settings"
+    repo-sync:'sync repository files to remote server according to current settings'
-    "repo-tree:dump repository tree based on packages dependencies"
+    repo-tree:'dump repository tree based on packages dependencies'
-    "repo-triggers:run triggers on empty build result as configured by settings"
+    repo-triggers:'run triggers on empty build result as configured by settings'
-    "repo-update:check for packages updates and run build process if requested"
+    repo-update:'check for packages updates and run build process if requested'
-    "report:generate repository report according to current settings"
+    report:'generate repository report according to current settings'
-    "run:run multiple commands on success run of the previous command"
+    run:'run multiple commands on success run of the previous command'
-    "search:search for package in AUR using API"
+    search:'search for package in AUR using API'
-    "service-clean:remove local caches"
+    service-clean:'remove local caches'
-    "service-config:dump configuration for the specified architecture"
+    service-config:'dump configuration for the specified architecture'
-    "service-config-validate:validate configuration and print found errors"
+    service-config-validate:'validate configuration and print found errors'
-    "service-key-import:import PGP key from public sources to the repository user"
+    service-key-import:'import PGP key from public sources to the repository user'
-    "service-repositories:list all available repositories"
+    service-repositories:'list all available repositories'
-    "service-run:run multiple commands on success run of the previous command"
+    service-run:'run multiple commands on success run of the previous command'
-    "service-setup:create initial service configuration, requires root"
+    service-setup:'create initial service configuration as the repository owner'
-    "service-shell:drop into python shell"
+    service-shell:'drop into python shell'
-    "service-tree-migrate:migrate repository tree between versions"
+    service-tree-migrate:'migrate repository tree between versions'
-    "setup:create initial service configuration, requires root"
+    setup:'create initial service configuration as the repository owner'
-    "shell:drop into python shell"
+    shell:'drop into python shell'
-    "sign:(re-)sign packages and repository database according to current settings"
+    sign:'(re-)sign packages and repository database according to current settings'
-    "status:request status of the package"
+    status:'request status of the package'
-    "status-update:update package status on the status page"
+    status-update:'update package status on the status page'
-    "sync:sync repository files to remote server according to current settings"
+    sync:'sync repository files to remote server according to current settings'
-    "update:check for packages updates and run build process if requested"
+    update:'check for packages updates and run build process if requested'
-    "user-add:update user for web services with the given password and role. In case if password was not entered it will be asked interactively"
+    user-add:'update user for web services with the given password and role. In case if password was not entered it will be asked interactively'
-    "user-list:list users from the user mapping and their roles"
+    user-list:'list users from the user mapping and their roles'
-    "user-remove:remove user from the user mapping and update the configuration"
+    user-remove:'remove user from the user mapping and update the configuration'
-    "version:print application and its dependencies versions"
+    version:'print application and its dependencies versions'
-    "web:start web server"
+    web:'start web server'
-    "web-reload:reload web server configuration"
+    web-reload:'reload web server configuration'
   )
   _describe 'ahriman commands' _commands
 }
@@ -99,7 +104,7 @@ _shtab_ahriman_options=(
   {-l,--lock}"[lock file (default\: ahriman.pid)]:lock:"
   "--log-handler[explicit log handler specification. If none set, the handler will be guessed from environment (default\: None)]:log_handler:(console syslog journald)"
   {-q,--quiet}"[force disable any logging (default\: False)]"
-  {--report,--no-report}"[force enable or disable reporting to web service (default\: True)]:report:"
+  {--report,--no-report}"[force enable or disable reporting to web service (default\: True)]"
   {-r,--repository}"[filter by target repository (default\: None)]:repository:"
   "--unsafe[allow to run ahriman as non-ahriman user. Some actions might be unavailable (default\: False)]"
   "(- : *)"{-V,--version}"[show program\'s version number and exit]"
@@ -111,10 +116,10 @@ _shtab_ahriman_defaults_added=0
 
 _shtab_ahriman_add_options=(
   "(- : *)"{-h,--help}"[show this help message and exit]"
-  {--changes,--no-changes}"[calculate changes from the latest known commit if available (default\: True)]:changes:"
+  {--changes,--no-changes}"[calculate changes from the latest known commit if available (default\: True)]"
-  {--dependencies,--no-dependencies}"[process missing package dependencies (default\: True)]:dependencies:"
+  {--dependencies,--no-dependencies}"[process missing package dependencies (default\: True)]"
   {-e,--exit-code}"[return non-zero exit status if result is empty (default\: False)]"
-  {--increment,--no-increment}"[increment package release (pkgrel) version on duplicate (default\: True)]:increment:"
+  {--increment,--no-increment}"[increment package release (pkgrel) version on duplicate (default\: True)]"
   {-n,--now}"[run update function after (default\: False)]"
   {-s,--source}"[explicitly specify the package source for this command (default\: auto)]:source:(auto archive aur directory local remote repository)"
   {-u,--username}"[build as user (default\: None)]:username:"
@@ -129,7 +134,7 @@ _shtab_ahriman_add_defaults_added=0
 _shtab_ahriman_aur_search_options=(
   "(- : *)"{-h,--help}"[show this help message and exit]"
   {-e,--exit-code}"[return non-zero exit status if result is empty (default\: False)]"
-  {--info,--no-info}"[show additional package information (default\: False)]:info:"
+  {--info,--no-info}"[show additional package information (default\: False)]"
   "--sort-by[sort field by this field. In case if two packages have the same value of the specified field, they will be always sorted by name (default\: name)]:sort_by:(description first_submitted id last_modified maintainer name num_votes out_of_date package_base package_base_id popularity repository submitter url url_path version)"
   "(*):search terms, can be specified multiple times, the result will match all terms:"
 )
@@ -139,10 +144,10 @@ _shtab_ahriman_aur_search_defaults_added=0
 
 _shtab_ahriman_check_options=(
   "(- : *)"{-h,--help}"[show this help message and exit]"
-  {--changes,--no-changes}"[calculate changes from the latest known commit if available (default\: True)]:changes:"
+  {--changes,--no-changes}"[calculate changes from the latest known commit if available (default\: True)]"
-  {--check-files,--no-check-files}"[enable or disable checking of broken dependencies (e.g. dynamically linked libraries or modules directories) (default\: True)]:check_files:"
+  {--check-files,--no-check-files}"[enable or disable checking of broken dependencies (e.g. dynamically linked libraries or modules directories) (default\: True)]"
   {-e,--exit-code}"[return non-zero exit status if result is empty (default\: False)]"
-  {--vcs,--no-vcs}"[fetch actual version of VCS packages (default\: True)]:vcs:"
+  {--vcs,--no-vcs}"[fetch actual version of VCS packages (default\: True)]"
   "*"{-y,--refresh}"[download fresh package databases from the mirror before actions, -yy to force refresh even if up to date (default\: False)]"
   "(*)::filter check by package base (default\: None):"
 )
@@ -152,11 +157,11 @@ _shtab_ahriman_check_defaults_added=0
 
 _shtab_ahriman_clean_options=(
   "(- : *)"{-h,--help}"[show this help message and exit]"
-  {--cache,--no-cache}"[clear directory with package caches (default\: False)]:cache:"
+  {--cache,--no-cache}"[clear directory with package caches (default\: False)]"
-  {--chroot,--no-chroot}"[clear build chroot (default\: False)]:chroot:"
+  {--chroot,--no-chroot}"[clear build chroot (default\: False)]"
-  {--manual,--no-manual}"[clear manually added packages queue (default\: False)]:manual:"
+  {--manual,--no-manual}"[clear manually added packages queue (default\: False)]"
-  {--packages,--no-packages}"[clear directory with built packages (default\: False)]:packages:"
+  {--packages,--no-packages}"[clear directory with built packages (default\: False)]"
-  {--pacman,--no-pacman}"[clear directory with pacman local database cache (default\: False)]:pacman:"
+  {--pacman,--no-pacman}"[clear directory with pacman local database cache (default\: False)]"
 )
 
 # guard to ensure default positional specs are added only once per session
@@ -164,8 +169,8 @@ _shtab_ahriman_clean_defaults_added=0
 
 _shtab_ahriman_config_options=(
   "(- : *)"{-h,--help}"[show this help message and exit]"
-  {--info,--no-info}"[show additional information, e.g. configuration files (default\: True)]:info:"
+  {--info,--no-info}"[show additional information, e.g. configuration files (default\: True)]"
-  {--secure,--no-secure}"[hide passwords and secrets from output (default\: True)]:secure:"
+  {--secure,--no-secure}"[hide passwords and secrets from output (default\: True)]"
   ":filter settings by section (default\: None):"
   ":filter settings by key (default\: None):"
 )
@@ -195,17 +200,17 @@ _shtab_ahriman_copy_defaults_added=0
 _shtab_ahriman_daemon_options=(
   "(- : *)"{-h,--help}"[show this help message and exit]"
   {-i,--interval}"[interval between runs in seconds (default\: 43200)]:interval:"
-  {--aur,--no-aur}"[enable or disable checking for AUR updates (default\: True)]:aur:"
+  {--aur,--no-aur}"[enable or disable checking for AUR updates (default\: True)]"
-  {--changes,--no-changes}"[calculate changes from the latest known commit if available. Only applicable in dry run mode (default\: True)]:changes:"
+  {--changes,--no-changes}"[calculate changes from the latest known commit if available. Only applicable in dry run mode (default\: True)]"
-  {--check-files,--no-check-files}"[enable or disable checking of broken dependencies (e.g. dynamically linked libraries or modules directories) (default\: True)]:check_files:"
+  {--check-files,--no-check-files}"[enable or disable checking of broken dependencies (e.g. dynamically linked libraries or modules directories) (default\: True)]"
-  {--dependencies,--no-dependencies}"[process missing package dependencies (default\: True)]:dependencies:"
+  {--dependencies,--no-dependencies}"[process missing package dependencies (default\: True)]"
   "--dry-run[just perform check for updates, same as check command (default\: False)]"
-  {--increment,--no-increment}"[increment package release (pkgrel) on duplicate (default\: True)]:increment:"
+  {--increment,--no-increment}"[increment package release (pkgrel) on duplicate (default\: True)]"
-  {--local,--no-local}"[enable or disable checking of local packages for updates (default\: True)]:local:"
+  {--local,--no-local}"[enable or disable checking of local packages for updates (default\: True)]"
-  {--manual,--no-manual}"[include or exclude manual updates (default\: True)]:manual:"
+  {--manual,--no-manual}"[include or exclude manual updates (default\: True)]"
-  {--partitions,--no-partitions}"[instead of updating whole repository, split updates into chunks (default\: True)]:partitions:"
+  {--partitions,--no-partitions}"[instead of updating whole repository, split updates into chunks (default\: True)]"
   {-u,--username}"[build as user (default\: None)]:username:"
-  {--vcs,--no-vcs}"[fetch actual version of VCS packages (default\: True)]:vcs:"
+  {--vcs,--no-vcs}"[fetch actual version of VCS packages (default\: True)]"
   "*"{-y,--refresh}"[download fresh package databases from the mirror before actions, -yy to force refresh even if up to date (default\: False)]"
 )
 
@@ -247,10 +252,10 @@ _shtab_ahriman_init_options=(
   "(- : *)"{-h,--help}"[show this help message and exit]"
   "--build-as-user[force makepkg user to the specific one (default\: None)]:build_as_user:"
   "--from-configuration[path to default devtools pacman configuration (default\: \/usr\/share\/devtools\/pacman.conf.d\/extra.conf)]:from_configuration:"
-  {--generate-salt,--no-generate-salt}"[generate salt for user passwords (default\: False)]:generate_salt:"
+  {--generate-salt,--no-generate-salt}"[generate salt for user passwords (default\: False)]"
-  {--makeflags-jobs,--no-makeflags-jobs}"[append MAKEFLAGS variable with parallelism set to number of cores (default\: True)]:makeflags_jobs:"
+  {--makeflags-jobs,--no-makeflags-jobs}"[append MAKEFLAGS variable with parallelism set to number of cores (default\: True)]"
   "--mirror[use the specified explicitly mirror instead of including mirrorlist (default\: None)]:mirror:"
-  {--multilib,--no-multilib}"[add or do not multilib repository (default\: True)]:multilib:"
+  {--multilib,--no-multilib}"[add or do not multilib repository (default\: True)]"
   "--packager[packager name and email]:packager:"
   "--server[server to be used for devtools. If none set, local files will be used (default\: None)]:server:"
   "--sign-key[sign key id (default\: None)]:sign_key:"
@@ -273,10 +278,10 @@ _shtab_ahriman_key_import_defaults_added=0
 
 _shtab_ahriman_package_add_options=(
   "(- : *)"{-h,--help}"[show this help message and exit]"
-  {--changes,--no-changes}"[calculate changes from the latest known commit if available (default\: True)]:changes:"
+  {--changes,--no-changes}"[calculate changes from the latest known commit if available (default\: True)]"
-  {--dependencies,--no-dependencies}"[process missing package dependencies (default\: True)]:dependencies:"
+  {--dependencies,--no-dependencies}"[process missing package dependencies (default\: True)]"
   {-e,--exit-code}"[return non-zero exit status if result is empty (default\: False)]"
-  {--increment,--no-increment}"[increment package release (pkgrel) version on duplicate (default\: True)]:increment:"
+  {--increment,--no-increment}"[increment package release (pkgrel) version on duplicate (default\: True)]"
   {-n,--now}"[run update function after (default\: False)]"
   {-s,--source}"[explicitly specify the package source for this command (default\: auto)]:source:(auto archive aur directory local remote repository)"
   {-u,--username}"[build as user (default\: None)]:username:"
@@ -291,7 +296,7 @@ _shtab_ahriman_package_add_defaults_added=0
 _shtab_ahriman_package_archives_options=(
   "(- : *)"{-h,--help}"[show this help message and exit]"
   {-e,--exit-code}"[return non-zero exit status if result is empty (default\: False)]"
-  {--info,--no-info}"[show additional package information (default\: False)]:info:"
+  {--info,--no-info}"[show additional package information (default\: False)]"
   ":package base:"
 )
 
@@ -361,7 +366,7 @@ _shtab_ahriman_package_remove_defaults_added=0
 
 _shtab_ahriman_package_rollback_options=(
   "(- : *)"{-h,--help}"[show this help message and exit]"
-  {--hold,--no-hold}"[hold package afterwards (default\: True)]:hold:"
+  {--hold,--no-hold}"[hold package afterwards (default\: True)]"
   {-u,--username}"[build as user (default\: None)]:username:"
   ":package base:"
   ":package version:"
@@ -374,7 +379,7 @@ _shtab_ahriman_package_status_options=(
   "(- : *)"{-h,--help}"[show this help message and exit]"
   "--ahriman[get service status itself (default\: False)]"
   {-e,--exit-code}"[return non-zero exit status if result is empty (default\: False)]"
-  {--info,--no-info}"[show additional package information (default\: False)]:info:"
+  {--info,--no-info}"[show additional package information (default\: False)]"
   {-s,--status}"[filter packages by status (default\: None)]:status:(unknown pending building failed success)"
   "(*)::filter status by package base (default\: None):"
 )
@@ -409,10 +414,10 @@ _shtab_ahriman_package_unhold_defaults_added=0
 
 _shtab_ahriman_package_update_options=(
   "(- : *)"{-h,--help}"[show this help message and exit]"
-  {--changes,--no-changes}"[calculate changes from the latest known commit if available (default\: True)]:changes:"
+  {--changes,--no-changes}"[calculate changes from the latest known commit if available (default\: True)]"
-  {--dependencies,--no-dependencies}"[process missing package dependencies (default\: True)]:dependencies:"
+  {--dependencies,--no-dependencies}"[process missing package dependencies (default\: True)]"
   {-e,--exit-code}"[return non-zero exit status if result is empty (default\: False)]"
-  {--increment,--no-increment}"[increment package release (pkgrel) version on duplicate (default\: True)]:increment:"
+  {--increment,--no-increment}"[increment package release (pkgrel) version on duplicate (default\: True)]"
   {-n,--now}"[run update function after (default\: False)]"
   {-s,--source}"[explicitly specify the package source for this command (default\: auto)]:source:(auto archive aur directory local remote repository)"
   {-u,--username}"[build as user (default\: None)]:username:"
@@ -467,7 +472,7 @@ _shtab_ahriman_rebuild_options=(
   "*--depends-on[only rebuild packages that depend on specified packages (default\: None)]:depends_on:"
   "--dry-run[just perform check for packages without rebuild process itself (default\: False)]"
   "--from-database[read packages from database instead of filesystem. This feature in particular is required in case if you would like to restore repository from another repository instance. Note, however, that in order to restore packages you need to have original ahriman instance run with web service and have run repo-update at least once. (default\: False)]"
-  {--increment,--no-increment}"[increment package release (pkgrel) on duplicate (default\: True)]:increment:"
+  {--increment,--no-increment}"[increment package release (pkgrel) on duplicate (default\: True)]"
   {-e,--exit-code}"[return non-zero exit status if result is empty (default\: False)]"
   {-s,--status}"[filter packages by status. Requires --from-database to be set (default\: None)]:status:(unknown pending building failed success)"
   {-u,--username}"[build as user (default\: None)]:username:"
@@ -502,10 +507,10 @@ _shtab_ahriman_repo_backup_defaults_added=0
 
 _shtab_ahriman_repo_check_options=(
   "(- : *)"{-h,--help}"[show this help message and exit]"
-  {--changes,--no-changes}"[calculate changes from the latest known commit if available (default\: True)]:changes:"
+  {--changes,--no-changes}"[calculate changes from the latest known commit if available (default\: True)]"
-  {--check-files,--no-check-files}"[enable or disable checking of broken dependencies (e.g. dynamically linked libraries or modules directories) (default\: True)]:check_files:"
+  {--check-files,--no-check-files}"[enable or disable checking of broken dependencies (e.g. dynamically linked libraries or modules directories) (default\: True)]"
   {-e,--exit-code}"[return non-zero exit status if result is empty (default\: False)]"
-  {--vcs,--no-vcs}"[fetch actual version of VCS packages (default\: True)]:vcs:"
+  {--vcs,--no-vcs}"[fetch actual version of VCS packages (default\: True)]"
   "*"{-y,--refresh}"[download fresh package databases from the mirror before actions, -yy to force refresh even if up to date (default\: False)]"
   "(*)::filter check by package base (default\: None):"
 )
@@ -515,11 +520,11 @@ _shtab_ahriman_repo_check_defaults_added=0
 
 _shtab_ahriman_repo_clean_options=(
   "(- : *)"{-h,--help}"[show this help message and exit]"
-  {--cache,--no-cache}"[clear directory with package caches (default\: False)]:cache:"
+  {--cache,--no-cache}"[clear directory with package caches (default\: False)]"
-  {--chroot,--no-chroot}"[clear build chroot (default\: False)]:chroot:"
+  {--chroot,--no-chroot}"[clear build chroot (default\: False)]"
-  {--manual,--no-manual}"[clear manually added packages queue (default\: False)]:manual:"
+  {--manual,--no-manual}"[clear manually added packages queue (default\: False)]"
-  {--packages,--no-packages}"[clear directory with built packages (default\: False)]:packages:"
+  {--packages,--no-packages}"[clear directory with built packages (default\: False)]"
-  {--pacman,--no-pacman}"[clear directory with pacman local database cache (default\: False)]:pacman:"
+  {--pacman,--no-pacman}"[clear directory with pacman local database cache (default\: False)]"
 )
 
 # guard to ensure default positional specs are added only once per session
@@ -527,8 +532,8 @@ _shtab_ahriman_repo_clean_defaults_added=0
 
 _shtab_ahriman_repo_config_options=(
   "(- : *)"{-h,--help}"[show this help message and exit]"
-  {--info,--no-info}"[show additional information, e.g. configuration files (default\: True)]:info:"
+  {--info,--no-info}"[show additional information, e.g. configuration files (default\: True)]"
-  {--secure,--no-secure}"[hide passwords and secrets from output (default\: True)]:secure:"
+  {--secure,--no-secure}"[hide passwords and secrets from output (default\: True)]"
   ":filter settings by section (default\: None):"
   ":filter settings by key (default\: None):"
 )
@@ -561,17 +566,17 @@ _shtab_ahriman_repo_create_mirrorlist_defaults_added=0
 _shtab_ahriman_repo_daemon_options=(
   "(- : *)"{-h,--help}"[show this help message and exit]"
   {-i,--interval}"[interval between runs in seconds (default\: 43200)]:interval:"
-  {--aur,--no-aur}"[enable or disable checking for AUR updates (default\: True)]:aur:"
+  {--aur,--no-aur}"[enable or disable checking for AUR updates (default\: True)]"
-  {--changes,--no-changes}"[calculate changes from the latest known commit if available. Only applicable in dry run mode (default\: True)]:changes:"
+  {--changes,--no-changes}"[calculate changes from the latest known commit if available. Only applicable in dry run mode (default\: True)]"
-  {--check-files,--no-check-files}"[enable or disable checking of broken dependencies (e.g. dynamically linked libraries or modules directories) (default\: True)]:check_files:"
+  {--check-files,--no-check-files}"[enable or disable checking of broken dependencies (e.g. dynamically linked libraries or modules directories) (default\: True)]"
-  {--dependencies,--no-dependencies}"[process missing package dependencies (default\: True)]:dependencies:"
+  {--dependencies,--no-dependencies}"[process missing package dependencies (default\: True)]"
   "--dry-run[just perform check for updates, same as check command (default\: False)]"
-  {--increment,--no-increment}"[increment package release (pkgrel) on duplicate (default\: True)]:increment:"
+  {--increment,--no-increment}"[increment package release (pkgrel) on duplicate (default\: True)]"
-  {--local,--no-local}"[enable or disable checking of local packages for updates (default\: True)]:local:"
+  {--local,--no-local}"[enable or disable checking of local packages for updates (default\: True)]"
-  {--manual,--no-manual}"[include or exclude manual updates (default\: True)]:manual:"
+  {--manual,--no-manual}"[include or exclude manual updates (default\: True)]"
-  {--partitions,--no-partitions}"[instead of updating whole repository, split updates into chunks (default\: True)]:partitions:"
+  {--partitions,--no-partitions}"[instead of updating whole repository, split updates into chunks (default\: True)]"
   {-u,--username}"[build as user (default\: None)]:username:"
-  {--vcs,--no-vcs}"[fetch actual version of VCS packages (default\: True)]:vcs:"
+  {--vcs,--no-vcs}"[fetch actual version of VCS packages (default\: True)]"
   "*"{-y,--refresh}"[download fresh package databases from the mirror before actions, -yy to force refresh even if up to date (default\: False)]"
 )
 
@@ -582,10 +587,10 @@ _shtab_ahriman_repo_init_options=(
   "(- : *)"{-h,--help}"[show this help message and exit]"
   "--build-as-user[force makepkg user to the specific one (default\: None)]:build_as_user:"
   "--from-configuration[path to default devtools pacman configuration (default\: \/usr\/share\/devtools\/pacman.conf.d\/extra.conf)]:from_configuration:"
-  {--generate-salt,--no-generate-salt}"[generate salt for user passwords (default\: False)]:generate_salt:"
+  {--generate-salt,--no-generate-salt}"[generate salt for user passwords (default\: False)]"
-  {--makeflags-jobs,--no-makeflags-jobs}"[append MAKEFLAGS variable with parallelism set to number of cores (default\: True)]:makeflags_jobs:"
+  {--makeflags-jobs,--no-makeflags-jobs}"[append MAKEFLAGS variable with parallelism set to number of cores (default\: True)]"
   "--mirror[use the specified explicitly mirror instead of including mirrorlist (default\: None)]:mirror:"
-  {--multilib,--no-multilib}"[add or do not multilib repository (default\: True)]:multilib:"
+  {--multilib,--no-multilib}"[add or do not multilib repository (default\: True)]"
   "--packager[packager name and email]:packager:"
   "--server[server to be used for devtools. If none set, local files will be used (default\: None)]:server:"
   "--sign-key[sign key id (default\: None)]:sign_key:"
@@ -602,7 +607,7 @@ _shtab_ahriman_repo_rebuild_options=(
   "*--depends-on[only rebuild packages that depend on specified packages (default\: None)]:depends_on:"
   "--dry-run[just perform check for packages without rebuild process itself (default\: False)]"
   "--from-database[read packages from database instead of filesystem. This feature in particular is required in case if you would like to restore repository from another repository instance. Note, however, that in order to restore packages you need to have original ahriman instance run with web service and have run repo-update at least once. (default\: False)]"
-  {--increment,--no-increment}"[increment package release (pkgrel) on duplicate (default\: True)]:increment:"
+  {--increment,--no-increment}"[increment package release (pkgrel) on duplicate (default\: True)]"
   {-e,--exit-code}"[return non-zero exit status if result is empty (default\: False)]"
   {-s,--status}"[filter packages by status. Requires --from-database to be set (default\: None)]:status:(unknown pending building failed success)"
   {-u,--username}"[build as user (default\: None)]:username:"
@@ -639,10 +644,10 @@ _shtab_ahriman_repo_setup_options=(
   "(- : *)"{-h,--help}"[show this help message and exit]"
   "--build-as-user[force makepkg user to the specific one (default\: None)]:build_as_user:"
   "--from-configuration[path to default devtools pacman configuration (default\: \/usr\/share\/devtools\/pacman.conf.d\/extra.conf)]:from_configuration:"
-  {--generate-salt,--no-generate-salt}"[generate salt for user passwords (default\: False)]:generate_salt:"
+  {--generate-salt,--no-generate-salt}"[generate salt for user passwords (default\: False)]"
-  {--makeflags-jobs,--no-makeflags-jobs}"[append MAKEFLAGS variable with parallelism set to number of cores (default\: True)]:makeflags_jobs:"
+  {--makeflags-jobs,--no-makeflags-jobs}"[append MAKEFLAGS variable with parallelism set to number of cores (default\: True)]"
   "--mirror[use the specified explicitly mirror instead of including mirrorlist (default\: None)]:mirror:"
-  {--multilib,--no-multilib}"[add or do not multilib repository (default\: True)]:multilib:"
+  {--multilib,--no-multilib}"[add or do not multilib repository (default\: True)]"
   "--packager[packager name and email]:packager:"
   "--server[server to be used for devtools. If none set, local files will be used (default\: None)]:server:"
   "--sign-key[sign key id (default\: None)]:sign_key:"
@@ -709,17 +714,17 @@ _shtab_ahriman_repo_triggers_defaults_added=0
 
 _shtab_ahriman_repo_update_options=(
   "(- : *)"{-h,--help}"[show this help message and exit]"
-  {--aur,--no-aur}"[enable or disable checking for AUR updates (default\: True)]:aur:"
+  {--aur,--no-aur}"[enable or disable checking for AUR updates (default\: True)]"
-  {--changes,--no-changes}"[calculate changes from the latest known commit if available. Only applicable in dry run mode (default\: True)]:changes:"
+  {--changes,--no-changes}"[calculate changes from the latest known commit if available. Only applicable in dry run mode (default\: True)]"
-  {--check-files,--no-check-files}"[enable or disable checking of broken dependencies (e.g. dynamically linked libraries or modules directories) (default\: True)]:check_files:"
+  {--check-files,--no-check-files}"[enable or disable checking of broken dependencies (e.g. dynamically linked libraries or modules directories) (default\: True)]"
-  {--dependencies,--no-dependencies}"[process missing package dependencies (default\: True)]:dependencies:"
+  {--dependencies,--no-dependencies}"[process missing package dependencies (default\: True)]"
   "--dry-run[just perform check for updates, same as check command (default\: False)]"
   {-e,--exit-code}"[return non-zero exit status if result is empty (default\: False)]"
-  {--increment,--no-increment}"[increment package release (pkgrel) on duplicate (default\: True)]:increment:"
+  {--increment,--no-increment}"[increment package release (pkgrel) on duplicate (default\: True)]"
-  {--local,--no-local}"[enable or disable checking of local packages for updates (default\: True)]:local:"
+  {--local,--no-local}"[enable or disable checking of local packages for updates (default\: True)]"
-  {--manual,--no-manual}"[include or exclude manual updates (default\: True)]:manual:"
+  {--manual,--no-manual}"[include or exclude manual updates (default\: True)]"
   {-u,--username}"[build as user (default\: None)]:username:"
-  {--vcs,--no-vcs}"[fetch actual version of VCS packages (default\: True)]:vcs:"
+  {--vcs,--no-vcs}"[fetch actual version of VCS packages (default\: True)]"
   "*"{-y,--refresh}"[download fresh package databases from the mirror before actions, -yy to force refresh even if up to date (default\: False)]"
   "(*)::filter check by package base (default\: None):"
 )
@@ -745,7 +750,7 @@ _shtab_ahriman_run_defaults_added=0
 _shtab_ahriman_search_options=(
   "(- : *)"{-h,--help}"[show this help message and exit]"
   {-e,--exit-code}"[return non-zero exit status if result is empty (default\: False)]"
-  {--info,--no-info}"[show additional package information (default\: False)]:info:"
+  {--info,--no-info}"[show additional package information (default\: False)]"
   "--sort-by[sort field by this field. In case if two packages have the same value of the specified field, they will be always sorted by name (default\: name)]:sort_by:(description first_submitted id last_modified maintainer name num_votes out_of_date package_base package_base_id popularity repository submitter url url_path version)"
   "(*):search terms, can be specified multiple times, the result will match all terms:"
 )
@@ -755,11 +760,11 @@ _shtab_ahriman_search_defaults_added=0
 
 _shtab_ahriman_service_clean_options=(
   "(- : *)"{-h,--help}"[show this help message and exit]"
-  {--cache,--no-cache}"[clear directory with package caches (default\: False)]:cache:"
+  {--cache,--no-cache}"[clear directory with package caches (default\: False)]"
-  {--chroot,--no-chroot}"[clear build chroot (default\: False)]:chroot:"
+  {--chroot,--no-chroot}"[clear build chroot (default\: False)]"
-  {--manual,--no-manual}"[clear manually added packages queue (default\: False)]:manual:"
+  {--manual,--no-manual}"[clear manually added packages queue (default\: False)]"
-  {--packages,--no-packages}"[clear directory with built packages (default\: False)]:packages:"
+  {--packages,--no-packages}"[clear directory with built packages (default\: False)]"
-  {--pacman,--no-pacman}"[clear directory with pacman local database cache (default\: False)]:pacman:"
+  {--pacman,--no-pacman}"[clear directory with pacman local database cache (default\: False)]"
 )
 
 # guard to ensure default positional specs are added only once per session
@@ -767,8 +772,8 @@ _shtab_ahriman_service_clean_defaults_added=0
 
 _shtab_ahriman_service_config_options=(
   "(- : *)"{-h,--help}"[show this help message and exit]"
-  {--info,--no-info}"[show additional information, e.g. configuration files (default\: True)]:info:"
+  {--info,--no-info}"[show additional information, e.g. configuration files (default\: True)]"
-  {--secure,--no-secure}"[hide passwords and secrets from output (default\: True)]:secure:"
+  {--secure,--no-secure}"[hide passwords and secrets from output (default\: True)]"
   ":filter settings by section (default\: None):"
   ":filter settings by key (default\: None):"
 )
@@ -795,7 +800,7 @@ _shtab_ahriman_service_key_import_defaults_added=0
 
 _shtab_ahriman_service_repositories_options=(
   "(- : *)"{-h,--help}"[show this help message and exit]"
-  {--id-only,--no-id-only}"[show machine readable identifier instead (default\: False)]:id_only:"
+  {--id-only,--no-id-only}"[show machine readable identifier instead (default\: False)]"
 )
 
 # guard to ensure default positional specs are added only once per session
@@ -813,10 +818,10 @@ _shtab_ahriman_service_setup_options=(
   "(- : *)"{-h,--help}"[show this help message and exit]"
   "--build-as-user[force makepkg user to the specific one (default\: None)]:build_as_user:"
   "--from-configuration[path to default devtools pacman configuration (default\: \/usr\/share\/devtools\/pacman.conf.d\/extra.conf)]:from_configuration:"
-  {--generate-salt,--no-generate-salt}"[generate salt for user passwords (default\: False)]:generate_salt:"
+  {--generate-salt,--no-generate-salt}"[generate salt for user passwords (default\: False)]"
-  {--makeflags-jobs,--no-makeflags-jobs}"[append MAKEFLAGS variable with parallelism set to number of cores (default\: True)]:makeflags_jobs:"
+  {--makeflags-jobs,--no-makeflags-jobs}"[append MAKEFLAGS variable with parallelism set to number of cores (default\: True)]"
   "--mirror[use the specified explicitly mirror instead of including mirrorlist (default\: None)]:mirror:"
-  {--multilib,--no-multilib}"[add or do not multilib repository (default\: True)]:multilib:"
+  {--multilib,--no-multilib}"[add or do not multilib repository (default\: True)]"
   "--packager[packager name and email]:packager:"
   "--server[server to be used for devtools. If none set, local files will be used (default\: None)]:server:"
   "--sign-key[sign key id (default\: None)]:sign_key:"
@@ -848,10 +853,10 @@ _shtab_ahriman_setup_options=(
   "(- : *)"{-h,--help}"[show this help message and exit]"
   "--build-as-user[force makepkg user to the specific one (default\: None)]:build_as_user:"
   "--from-configuration[path to default devtools pacman configuration (default\: \/usr\/share\/devtools\/pacman.conf.d\/extra.conf)]:from_configuration:"
-  {--generate-salt,--no-generate-salt}"[generate salt for user passwords (default\: False)]:generate_salt:"
+  {--generate-salt,--no-generate-salt}"[generate salt for user passwords (default\: False)]"
-  {--makeflags-jobs,--no-makeflags-jobs}"[append MAKEFLAGS variable with parallelism set to number of cores (default\: True)]:makeflags_jobs:"
+  {--makeflags-jobs,--no-makeflags-jobs}"[append MAKEFLAGS variable with parallelism set to number of cores (default\: True)]"
   "--mirror[use the specified explicitly mirror instead of including mirrorlist (default\: None)]:mirror:"
-  {--multilib,--no-multilib}"[add or do not multilib repository (default\: True)]:multilib:"
+  {--multilib,--no-multilib}"[add or do not multilib repository (default\: True)]"
   "--packager[packager name and email]:packager:"
   "--server[server to be used for devtools. If none set, local files will be used (default\: None)]:server:"
   "--sign-key[sign key id (default\: None)]:sign_key:"
@@ -884,7 +889,7 @@ _shtab_ahriman_status_options=(
   "(- : *)"{-h,--help}"[show this help message and exit]"
   "--ahriman[get service status itself (default\: False)]"
   {-e,--exit-code}"[return non-zero exit status if result is empty (default\: False)]"
-  {--info,--no-info}"[show additional package information (default\: False)]:info:"
+  {--info,--no-info}"[show additional package information (default\: False)]"
   {-s,--status}"[filter packages by status (default\: None)]:status:(unknown pending building failed success)"
   "(*)::filter status by package base (default\: None):"
 )
@@ -910,17 +915,17 @@ _shtab_ahriman_sync_defaults_added=0
 
 _shtab_ahriman_update_options=(
   "(- : *)"{-h,--help}"[show this help message and exit]"
-  {--aur,--no-aur}"[enable or disable checking for AUR updates (default\: True)]:aur:"
+  {--aur,--no-aur}"[enable or disable checking for AUR updates (default\: True)]"
-  {--changes,--no-changes}"[calculate changes from the latest known commit if available. Only applicable in dry run mode (default\: True)]:changes:"
+  {--changes,--no-changes}"[calculate changes from the latest known commit if available. Only applicable in dry run mode (default\: True)]"
-  {--check-files,--no-check-files}"[enable or disable checking of broken dependencies (e.g. dynamically linked libraries or modules directories) (default\: True)]:check_files:"
+  {--check-files,--no-check-files}"[enable or disable checking of broken dependencies (e.g. dynamically linked libraries or modules directories) (default\: True)]"
-  {--dependencies,--no-dependencies}"[process missing package dependencies (default\: True)]:dependencies:"
+  {--dependencies,--no-dependencies}"[process missing package dependencies (default\: True)]"
   "--dry-run[just perform check for updates, same as check command (default\: False)]"
   {-e,--exit-code}"[return non-zero exit status if result is empty (default\: False)]"
-  {--increment,--no-increment}"[increment package release (pkgrel) on duplicate (default\: True)]:increment:"
+  {--increment,--no-increment}"[increment package release (pkgrel) on duplicate (default\: True)]"
-  {--local,--no-local}"[enable or disable checking of local packages for updates (default\: True)]:local:"
+  {--local,--no-local}"[enable or disable checking of local packages for updates (default\: True)]"
-  {--manual,--no-manual}"[include or exclude manual updates (default\: True)]:manual:"
+  {--manual,--no-manual}"[include or exclude manual updates (default\: True)]"
   {-u,--username}"[build as user (default\: None)]:username:"
-  {--vcs,--no-vcs}"[fetch actual version of VCS packages (default\: True)]:vcs:"
+  {--vcs,--no-vcs}"[fetch actual version of VCS packages (default\: True)]"
   "*"{-y,--refresh}"[download fresh package databases from the mirror before actions, -yy to force refresh even if up to date (default\: False)]"
   "(*)::filter check by package base (default\: None):"
 )
@@ -981,7 +986,7 @@ _shtab_ahriman_web_reload_defaults_added=0
 
 
 _shtab_ahriman() {
-  local context state line curcontext="$curcontext" one_or_more='(*)' remainder='(-)*' default='*::: :->ahriman'
+  local context state line curcontext="$curcontext" one_or_more='(*)' remainder='(-)*:' default='*::: :->ahriman'
 
   # Add default positional/remainder specs only if none exist, and only once per session
   if (( ! _shtab_ahriman_defaults_added )); then

ahriman-core/src/ahriman/__init__.py

@@ -17,4 +17,4 @@
 # You should have received a copy of the GNU General Public License
 # along with this program. If not, see <http://www.gnu.org/licenses/>.
 #
-__version__ = "2.21.1"
+__version__ = "2.22.2"

ahriman-core/src/ahriman/application/ahriman.py

@@ -28,7 +28,6 @@ from ahriman import __version__
 from ahriman.application.handlers.handler import Handler
 from ahriman.application.help_formatter import _HelpFormatter
 from ahriman.core.module_loader import implementations
-from ahriman.core.utils import enum_values
 from ahriman.models.log_handler import LogHandler
 
 
@@ -75,7 +74,7 @@ Start web service (requires additional configuration):
     parser.add_argument("-l", "--lock", help="lock file", type=Path, default=Path("ahriman.pid"))
     parser.add_argument("--log-handler", help="explicit log handler specification. If none set, the handler will be "
                                               "guessed from environment",
-                        type=LogHandler, choices=enum_values(LogHandler))
+                        type=LogHandler, choices=tuple(LogHandler))
     parser.add_argument("-q", "--quiet", help="force disable any logging", action="store_true")
     parser.add_argument("--report", help="force enable or disable reporting to web service",
                         action=argparse.BooleanOptionalAction, default=True)

ahriman-core/src/ahriman/application/handlers/add.py

@@ -23,7 +23,7 @@ from ahriman.application.application import Application
 from ahriman.application.handlers.handler import Handler, SubParserAction
 from ahriman.application.handlers.update import Update
 from ahriman.core.configuration import Configuration
-from ahriman.core.utils import enum_values, extract_user
+from ahriman.core.utils import extract_user
 from ahriman.models.package_source import PackageSource
 from ahriman.models.pkgbuild_patch import PkgbuildPatch
 from ahriman.models.repository_id import RepositoryId
@@ -85,7 +85,7 @@ class Add(Handler):
                             action=argparse.BooleanOptionalAction, default=True)
         parser.add_argument("-n", "--now", help="run update function after", action="store_true")
         parser.add_argument("-s", "--source", help="explicitly specify the package source for this command",
-                            type=PackageSource, choices=enum_values(PackageSource), default=PackageSource.Auto)
+                            type=PackageSource, choices=tuple(PackageSource), default=PackageSource.Auto)
         parser.add_argument("-u", "--username", help="build as user", default=extract_user())
         parser.add_argument("-v", "--variable", help="apply specified makepkg variables to the next build",
                             action="append")

ahriman-core/src/ahriman/application/handlers/rebuild.py

@@ -22,7 +22,7 @@ import argparse
 from ahriman.application.application import Application
 from ahriman.application.handlers.handler import Handler, SubParserAction
 from ahriman.core.configuration import Configuration
-from ahriman.core.utils import enum_values, extract_user
+from ahriman.core.utils import extract_user
 from ahriman.models.build_status import BuildStatusEnum
 from ahriman.models.package import Package
 from ahriman.models.packagers import Packagers
@@ -88,7 +88,7 @@ class Rebuild(Handler):
         parser.add_argument("-e", "--exit-code", help="return non-zero exit status if result is empty",
                             action="store_true")
         parser.add_argument("-s", "--status", help="filter packages by status. Requires --from-database to be set",
-                            type=BuildStatusEnum, choices=enum_values(BuildStatusEnum))
+                            type=BuildStatusEnum, choices=tuple(BuildStatusEnum))
         parser.add_argument("-u", "--username", help="build as user", default=extract_user())
         return parser
 

ahriman-core/src/ahriman/application/handlers/setup.py

@@ -29,7 +29,6 @@ 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 InitializeError, MissingArchitectureError
-from ahriman.core.utils import enum_values
 from ahriman.models.repository_id import RepositoryId
 from ahriman.models.sign_settings import SignSettings
 from ahriman.models.user import User
@@ -112,7 +111,7 @@ class Setup(Handler):
         parser.add_argument("--server", help="server to be used for devtools. If none set, local files will be used")
         parser.add_argument("--sign-key", help="sign key id")
         parser.add_argument("--sign-target", help="sign options", action="append",
-                            type=SignSettings.from_option, choices=enum_values(SignSettings))
+                            type=SignSettings.from_option, choices=tuple(SignSettings))
         parser.add_argument("--web-port", help="port of the web service", type=int)
         parser.add_argument("--web-unix-socket", help="path to unix socket used for interprocess communications",
                             type=Path)

ahriman-core/src/ahriman/application/handlers/statistics.py

@@ -28,7 +28,7 @@ from ahriman.application.application import Application
 from ahriman.application.handlers.handler import Handler, SubParserAction
 from ahriman.core.configuration import Configuration
 from ahriman.core.formatters import EventStatsPrinter, PackageStatsPrinter, RepositoryStatsPrinter
-from ahriman.core.utils import enum_values, pretty_datetime
+from ahriman.core.utils import pretty_datetime
 from ahriman.models.event import Event, EventType
 from ahriman.models.repository_id import RepositoryId
 
@@ -85,7 +85,7 @@ class Statistics(Handler):
         parser.add_argument("package", help="fetch only events for the specified package", nargs="?")
         parser.add_argument("--chart", help="create updates chart and save it to the specified path", type=Path)
         parser.add_argument("-e", "--event", help="event type filter",
-                            type=EventType, choices=enum_values(EventType), default=EventType.PackageUpdated)
+                            type=EventType, choices=tuple(EventType), default=EventType.PackageUpdated)
         parser.add_argument("--from-date", help="only fetch events which are newer than the date")
         parser.add_argument("--limit", help="limit response by specified amount of events", type=int, default=-1)
         parser.add_argument("--offset", help="skip specified amount of events", type=int, default=0)

ahriman-core/src/ahriman/application/handlers/status.py

@@ -26,7 +26,6 @@ from ahriman.application.handlers.handler import Handler, SubParserAction
 from ahriman.core.configuration import Configuration
 from ahriman.core.formatters import PackagePrinter, StatusPrinter
 from ahriman.core.types import Comparable
-from ahriman.core.utils import enum_values
 from ahriman.models.build_status import BuildStatus, BuildStatusEnum
 from ahriman.models.package import Package
 from ahriman.models.repository_id import RepositoryId
@@ -93,7 +92,7 @@ class Status(Handler):
         parser.add_argument("--info", help="show additional package information",
                             action=argparse.BooleanOptionalAction, default=False)
         parser.add_argument("-s", "--status", help="filter packages by status",
-                            type=BuildStatusEnum, choices=enum_values(BuildStatusEnum))
+                            type=BuildStatusEnum, choices=tuple(BuildStatusEnum))
         parser.set_defaults(lock=None, quiet=True, report=False, unsafe=True)
         return parser
 

ahriman-core/src/ahriman/application/handlers/status_update.py

@@ -22,7 +22,6 @@ import argparse
 from ahriman.application.application import Application
 from ahriman.application.handlers.handler import Handler, SubParserAction
 from ahriman.core.configuration import Configuration
-from ahriman.core.utils import enum_values
 from ahriman.models.action import Action
 from ahriman.models.build_status import BuildStatusEnum
 from ahriman.models.repository_id import RepositoryId
@@ -97,7 +96,7 @@ class StatusUpdate(Handler):
                                             "If no packages supplied, service status will be updated",
                             nargs="*")
         parser.add_argument("-s", "--status", help="new package build status",
-                            type=BuildStatusEnum, choices=enum_values(BuildStatusEnum), default=BuildStatusEnum.Success)
+                            type=BuildStatusEnum, choices=tuple(BuildStatusEnum), default=BuildStatusEnum.Success)
         parser.set_defaults(action=Action.Update, lock=None, quiet=True, report=False, unsafe=True)
         return parser
 
@@ -115,7 +114,7 @@ class StatusUpdate(Handler):
         parser = root.add_parser("repo-status-update", help="update repository status",
                                  description="update repository status on the status page")
         parser.add_argument("-s", "--status", help="new status",
-                            type=BuildStatusEnum, choices=enum_values(BuildStatusEnum), default=BuildStatusEnum.Success)
+                            type=BuildStatusEnum, choices=tuple(BuildStatusEnum), default=BuildStatusEnum.Success)
         parser.set_defaults(action=Action.Update, lock=None, package=[], quiet=True, report=False, unsafe=True)
         return parser
 

ahriman-core/src/ahriman/application/handlers/users.py

@@ -25,7 +25,6 @@ from ahriman.core.configuration import Configuration
 from ahriman.core.database import SQLite
 from ahriman.core.exceptions import PasswordError
 from ahriman.core.formatters import UserPrinter
-from ahriman.core.utils import enum_values
 from ahriman.models.action import Action
 from ahriman.models.repository_id import RepositoryId
 from ahriman.models.user import User
@@ -89,7 +88,7 @@ class Users(Handler):
             "-p", "--password", help="user password. Blank password will be treated as empty password, "
             "which is in particular must be used for OAuth2 authorization type.")
         parser.add_argument("-R", "--role", help="user access level",
-                            type=UserAccess, choices=enum_values(UserAccess), default=UserAccess.Read)
+                            type=UserAccess, choices=tuple(UserAccess), default=UserAccess.Read)
         parser.set_defaults(action=Action.Update, architecture="", exit_code=False, lock=None, quiet=True,
                             report=False, repository="")
         return parser
@@ -110,8 +109,7 @@ class Users(Handler):
         parser.add_argument("username", help="filter users by username", nargs="?")
         parser.add_argument("-e", "--exit-code", help="return non-zero exit status if result is empty",
                             action="store_true")
-        parser.add_argument("-R", "--role", help="filter users by role", type=UserAccess,
+        parser.add_argument("-R", "--role", help="filter users by role", type=UserAccess, choices=tuple(UserAccess))
-                            choices=enum_values(UserAccess))
         parser.set_defaults(action=Action.List, architecture="", lock=None, quiet=True, report=False, repository="",
                             unsafe=True)
         return parser

ahriman-core/src/ahriman/core/exceptions.py

@@ -83,6 +83,15 @@ Process stderr:
 {self.stderr}"""
 
 
+class DependencyResolutionError(RuntimeError):
+    """
+    exception raised when package dependencies cannot be resolved
+    """
+
+    def __init__(self, unprocessed: list[str]) -> None:
+        RuntimeError.__init__(self, f"Could not process dependencies. Unresolved packages: {unprocessed}")
+
+
 class DuplicateRunError(RuntimeError):
     """
     exception which will be raised if there is another application instance

ahriman-core/src/ahriman/core/tree.py

@@ -22,7 +22,7 @@ from __future__ import annotations
 from collections.abc import Iterable
 from functools import partial
 
-from ahriman.core.exceptions import PartitionError
+from ahriman.core.exceptions import DependencyResolutionError, PartitionError
 from ahriman.core.utils import minmax, partition
 from ahriman.models.package import Package
 
@@ -226,6 +226,9 @@ class Tree:
 
         Returns:
             list[list[Package]]: sorted list of packages lists based on their dependencies
+
+        Raises:
+            DependencyResolutionError: dependency cycle prevents ordering packages
         """
         unsorted: list[list[Leaf]] = []
 
@@ -235,6 +238,8 @@ class Tree:
             # additional workaround with partial in order to hide cell-var-from-loop pylint warning
             predicate = partial(Leaf.is_root, packages=unprocessed)
             new_level, unprocessed = partition(unprocessed, predicate)
+            if not new_level:
+                raise DependencyResolutionError([leaf.package.base for leaf in unprocessed])
             unsorted.append(new_level)
 
         # move leaves to the end if they are not required at the next level

ahriman-core/src/ahriman/core/utils.py

@@ -31,7 +31,6 @@ import subprocess
 
 from collections.abc import Callable, Iterable, Iterator, Mapping
 from dataclasses import asdict
-from enum import Enum
 from filelock import FileLock
 from pathlib import Path
 from pwd import getpwuid
@@ -46,7 +45,6 @@ __all__ = [
     "check_output",
     "check_user",
     "dataclass_view",
-    "enum_values",
     "extract_user",
     "filelock",
     "filter_json",
@@ -242,19 +240,6 @@ def dataclass_view(instance: Any) -> dict[str, Any]:
     return asdict(instance, dict_factory=lambda fields: {key: value for key, value in fields if value is not None})
 
 
-def enum_values(enum: type[Enum]) -> list[str]:
-    """
-    generate list of enumeration values from the source
-
-    Args:
-        enum(type[Enum]): source enumeration class
-
-    Returns:
-        list[str]: available enumeration values as string
-    """
-    return [str(key.value) for key in enum]  # explicit str conversion for typing
-
-
 def extract_user() -> str | None:
     """
     extract user from system environment

ahriman-core/tests/ahriman/core/test_tree.py

@@ -1,6 +1,6 @@
 import pytest
 
-from ahriman.core.exceptions import PartitionError
+from ahriman.core.exceptions import DependencyResolutionError, PartitionError
 from ahriman.core.tree import Leaf, Tree
 from ahriman.models.package import Package
 from ahriman.models.package_description import PackageDescription
@@ -270,3 +270,14 @@ def test_tree_partitions() -> None:
     first, second = tree.partitions(count=3)
     assert first == [leaf1.package, leaf2.package, leaf3.package, leaf5.package]
     assert second == [leaf4.package]
+
+
+def test_tree_levels_cycle(leaf_ahriman: Leaf, leaf_python_schedule: Leaf) -> None:
+    """
+    must raise an exception if dependencies contain a cycle
+    """
+    leaf_ahriman.dependencies = set(leaf_python_schedule.items)
+    leaf_python_schedule.dependencies = set(leaf_ahriman.items)
+
+    with pytest.raises(DependencyResolutionError):
+        Tree([leaf_ahriman, leaf_python_schedule]).levels()

ahriman-core/tests/ahriman/core/test_utils.py

@@ -221,15 +221,6 @@ def test_dataclass_view_without_none(package_ahriman: Package) -> None:
     assert Package.from_json(result) == package_ahriman
 
 
-def test_enum_values() -> None:
-    """
-    must correctly generate choices from enumeration classes
-    """
-    values = enum_values(PackageSource)
-    for value in values:
-        assert PackageSource(value).value == value
-
-
 def test_extract_user() -> None:
     """
     must extract user from system environment

ahriman-web/src/ahriman/web/views/v1/auditlog/event_bus.py

@@ -87,7 +87,8 @@ class EventBusView(BaseView):
         """
         while response.is_connected():
             try:
-                event_type, data = await wait_for(queue.get(), timeout=response.ping_interval)
+                # pylint: disable=protected-access
+                event_type, data = await wait_for(queue.get(), timeout=response._ping_interval)
             except TimeoutError:
                 continue
             except QueueShutDown:

ahriman-web/tests/ahriman/web/views/v1/auditlog/test_view_v1_auditlog_event_bus.py

@@ -3,6 +3,7 @@ import pytest
 
 from aiohttp.test_utils import TestClient
 from aiohttp.web import HTTPBadRequest
+from aiohttp_sse import EventSourceResponse
 from asyncio import Queue
 from multidict import MultiDict
 from pytest_mock import MockerFixture
@@ -95,21 +96,20 @@ def test_routes() -> None:
 
 async def test_run_timeout() -> None:
     """
-    must handle timeout and continue loop
+    must recheck the connection after a queue timeout
     """
-    queue = Queue()
+    queue = AsyncMock(spec_set=Queue)
+    queue.get.side_effect = TimeoutError
+    response = AsyncMock(spec_set=EventSourceResponse())
+    response._ping_interval = 0.01
+    response.is_connected.side_effect = [True, False]
 
-    async def _shutdown() -> None:
-        await asyncio.sleep(0.05)
-        queue.shutdown()
-
-    response = AsyncMock()
-    response.is_connected = lambda: True
-    response.ping_interval = 0.01
-
-    asyncio.create_task(_shutdown())
     await EventBusView._run(response, queue)
 
+    assert response.is_connected.call_count == 2
+    queue.get.assert_awaited_once()
+    response.send.assert_not_awaited()
+
 
 def test_topics() -> None:
     """

archlinux/PKGBUILD

@@ -2,7 +2,7 @@
 
 pkgbase='ahriman'
 pkgname=('ahriman' 'ahriman-core' 'ahriman-triggers' 'ahriman-web')
-pkgver=2.21.1
+pkgver=2.22.2
 pkgrel=1
 pkgdesc="ArcH linux ReposItory MANager"
 arch=('any')

docs/migrations/2.22.0.rst

@@ -52,3 +52,5 @@ The repository root inside the Docker image has changed from ``/var/lib/ahriman/
 
 #.
    Start the containers again.
+
+Please note, that some environment variables - ``AHRIMAN_FORCE_ROOT`` and ``AHRIMAN_REPOSITORY_ROOT`` - have been also removed and not supported anymore. ``AHRIMAN_POSTSETUP_COMMAND`` and ``AHRIMAN_PRESETUP_COMMAND`` are now executed as non-root user.

frontend/package.json

@@ -2,34 +2,37 @@
     "dependencies": {
         "@emotion/react": ">=11.14.0 <11.15.0",
         "@emotion/styled": ">=11.14.0 <11.15.0",
-        "@mui/icons-material": ">=9.3.0 <9.4.0",
+        "@mui/icons-material": ">=9.5.0 <9.6.0",
-        "@mui/material": ">=9.3.0 <9.4.0",
+        "@mui/material": ">=9.5.0 <9.6.0",
-        "@mui/x-data-grid": ">=9.11.0 <9.12.0",
+        "@mui/x-data-grid": ">=9.15.0 <9.16.0",
-        "@tanstack/react-query": ">=5.101.0 <5.102.0",
+        "@tanstack/react-query": ">=5.104.0 <5.105.0",
         "chart.js": ">=4.5.0 <4.6.0",
-        "react": ">=19.2.0 <19.3.0",
+        "react": ">=19.3.0 <19.4.0",
         "react-chartjs-2": ">=5.3.0 <5.4.0",
-        "react-dom": ">=19.2.0 <19.3.0",
+        "react-dom": ">=19.3.0 <19.4.0",
         "react-error-boundary": ">=6.1.0 <6.2.0",
         "react-syntax-highlighter": ">=16.1.0 <16.2.0"
     },
     "devDependencies": {
         "@eslint/js": ">=9.39.0 <9.40.0",
         "@stylistic/eslint-plugin": ">=5.10.0 <5.11.0",
-        "@types/react": ">=19.2.0 <19.3.0",
+        "@types/react": ">=19.3.0 <19.4.0",
-        "@types/react-dom": ">=19.2.0 <19.3.0",
+        "@types/react-dom": ">=19.3.0 <19.4.0",
         "@types/react-syntax-highlighter": ">=15.5.0 <15.6.0",
-        "@vitejs/plugin-react": ">=6.0.0 <6.1.0",
+        "@vitejs/plugin-react": ">=6.1.0 <6.2.0",
         "eslint": ">=9.39.0 <9.40.0",
         "eslint-plugin-react": ">=7.37.0 <7.38.0",
         "eslint-plugin-react-hooks": ">=7.1.0 <7.2.0",
         "eslint-plugin-react-refresh": ">=0.5.0 <0.6.0",
         "eslint-plugin-simple-import-sort": ">=14.0.0 <14.1.0",
         "typescript": ">=6.0.0 <6.1.0",
-        "typescript-eslint": ">=8.67.0 <8.68.0",
+        "typescript-eslint": ">=8.71.0 <8.72.0",
-        "vite": ">=8.2.0 <8.3.0"
+        "vite": ">=8.3.0 <8.4.0"
     },
     "name": "ahriman",
+    "overrides": {
+        "@mui/x-internals": "$@mui/x-data-grid"
+    },
     "private": true,
     "scripts": {
         "build": "tsc && vite build",
@@ -39,5 +42,5 @@
         "preview": "vite preview"
     },
     "type": "module",
-    "version": "2.21.1"
+    "version": "2.22.2"
 }

frontend/src/components/table/PackageTable.tsx

@@ -17,10 +17,13 @@
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
+import DeleteIcon from "@mui/icons-material/Delete";
+import PlayArrowIcon from "@mui/icons-material/PlayArrow";
 import { Box, Link } from "@mui/material";
 import {
     DataGrid,
     GRID_CHECKBOX_SELECTION_COL_DEF,
+    GridActionsCellItem,
     type GridColDef,
     type GridFilterModel,
     type GridRowId,
@@ -56,6 +59,7 @@ function createListColumn(
 
 export default function PackageTable(): React.JSX.Element {
     const table = usePackageTable();
+    const { handleRemove, handleUpdate, isAuthorized } = table;
     const apiRef = useGridApiRef();
     const debouncedSearch = useDebounce(table.searchText, 300);
 
@@ -96,8 +100,31 @@ export default function PackageTable(): React.JSX.Element {
                     <StatusCell isHeld={params.row.isHeld} status={params.row.status} />,
                 width: 120,
             },
+            ...isAuthorized ? [{
+                field: "actions",
+                type: "actions",
+                headerName: "actions",
+                width: 100,
+                disableExport: true,
+                getActions: ({ row }) => [
+                    <GridActionsCellItem
+                        key="update"
+                        icon={<PlayArrowIcon />}
+                        label={`Update ${row.base}`}
+                        title={`Update ${row.base}`}
+                        onClick={() => void handleUpdate([row.base])}
+                    />,
+                    <GridActionsCellItem
+                        key="remove"
+                        icon={<DeleteIcon />}
+                        label={`Remove ${row.base}`}
+                        title={`Remove ${row.base}`}
+                        onClick={() => void handleRemove([row.base])}
+                    />,
+                ],
+            } satisfies GridColDef<PackageRow>] : [],
         ],
-        [],
+        [handleRemove, handleUpdate, isAuthorized],
     );
 
     return <Box sx={{ display: "flex", flexDirection: "column", width: "100%" }}>
@@ -110,8 +137,10 @@ export default function PackageTable(): React.JSX.Element {
                 onRebuildClick: () => table.setDialogOpen("rebuild"),
                 onRefreshDatabaseClick: () => void table.handleRefreshDatabase(),
                 onReloadClick: table.handleReload,
-                onRemoveClick: () => void table.handleRemove(),
+                onRemoveClick: () => void table.handleRemove(table.selectionModel)
-                onUpdateClick: () => void table.handleUpdate(),
+                    .then(() => table.setSelectionModel([])),
+                onUpdateClick: () => void table.handleUpdate(table.selectionModel)
+                    .then(() => table.setSelectionModel([])),
             }}
             isAuthorized={table.isAuthorized}
             hasSelection={table.selectionModel.length > 0}
@@ -123,6 +152,7 @@ export default function PackageTable(): React.JSX.Element {
         <DataGrid
             apiRef={apiRef}
             checkboxSelection
+            localeText={{ checkboxSelectionHeaderName: "selection" }}
             columnVisibilityModel={table.columnVisibility}
             columns={columns}
             density="compact"
@@ -134,8 +164,8 @@ export default function PackageTable(): React.JSX.Element {
             }}
             loading={table.isLoading}
             onCellClick={(params, event) => {
-                // Don't open info dialog when clicking checkbox or link
+                // Don't open info dialog when clicking checkbox, actions, or link
-                if (params.field === GRID_CHECKBOX_SELECTION_COL_DEF.field) {
+                if (params.field === GRID_CHECKBOX_SELECTION_COL_DEF.field || params.field === "actions") {
                     return;
                 }
                 if ((event.target as HTMLElement).closest("a")) {

frontend/src/hooks/usePackageActions.ts

@@ -24,29 +24,27 @@ import { useClient } from "hooks/useClient";
 import { useNotification } from "hooks/useNotification";
 import { useRepository } from "hooks/useRepository";
 import type { RepositoryId } from "models/RepositoryId";
+import { useCallback } from "react";
 
 export interface UsePackageActionsResult {
     handleRefreshDatabase: () => Promise<void>;
     handleReload: () => void;
-    handleRemove: () => Promise<void>;
+    handleRemove: (packages: string[]) => Promise<void>;
-    handleUpdate: () => Promise<void>;
+    handleUpdate: (packages: string[]) => Promise<void>;
 }
 
-export function usePackageActions(
+export function usePackageActions(): UsePackageActionsResult {
-    selectionModel: string[],
-    setSelectionModel: (model: string[]) => void,
-): UsePackageActionsResult {
     const client = useClient();
     const { currentRepository } = useRepository();
     const { showSuccess, showError } = useNotification();
     const queryClient = useQueryClient();
 
-    const invalidate = (repository: RepositoryId): void => {
+    const invalidate = useCallback((repository: RepositoryId): void => {
         void queryClient.invalidateQueries({ queryKey: QueryKeys.packages(repository) });
         void queryClient.invalidateQueries({ queryKey: QueryKeys.status(repository) });
-    };
+    }, [queryClient]);
 
-    const performAction = async (
+    const performAction = useCallback(async (
         action: (repository: RepositoryId) => Promise<string>,
         errorMessage: string,
     ): Promise<void> => {
@@ -57,11 +55,10 @@ export function usePackageActions(
             const successMessage = await action(currentRepository);
             showSuccess("Success", successMessage);
             invalidate(currentRepository);
-            setSelectionModel([]);
         } catch (exception) {
             showError("Action failed", `${errorMessage}: ${ApiError.errorDetail(exception)}`);
         }
-    };
+    }, [currentRepository, invalidate, showError, showSuccess]);
 
     const handleReload = (): void => {
         if (currentRepository !== null) {
@@ -69,14 +66,16 @@ export function usePackageActions(
         }
     };
 
-    const handleUpdate = (): Promise<void> => performAction(async (repository): Promise<string> => {
+    const handleUpdate = useCallback((packages: string[]): Promise<void> => {
-        if (selectionModel.length === 0) {
+        return performAction(async (repository): Promise<string> => {
-            await client.service.servicePackageUpdate(repository, { packages: [] });
+            if (packages.length === 0) {
-            return "Repository update has been run";
+                await client.service.servicePackageUpdate(repository, { packages: [] });
-        }
+                return "Repository update has been run";
-        await client.service.servicePackageAdd(repository, { packages: selectionModel });
+            }
-        return `Run update for packages ${selectionModel.join(", ")}`;
+            await client.service.servicePackageAdd(repository, { packages });
-    }, "Packages update failed");
+            return `Run update for packages ${packages.join(", ")}`;
+        }, "Packages update failed");
+    }, [client, performAction]);
 
     const handleRefreshDatabase = (): Promise<void> => performAction(async (repository): Promise<string> => {
         await client.service.servicePackageUpdate(repository, {
@@ -89,15 +88,15 @@ export function usePackageActions(
         return "Pacman database update has been requested";
     }, "Could not update pacman databases");
 
-    const handleRemove = (): Promise<void> => {
+    const handleRemove = useCallback((packages: string[]): Promise<void> => {
-        if (selectionModel.length === 0) {
+        if (packages.length === 0) {
             return Promise.resolve();
         }
         return performAction(async (repository): Promise<string> => {
-            await client.service.servicePackageRemove(repository, selectionModel);
+            await client.service.servicePackageRemove(repository, packages);
-            return `Packages ${selectionModel.join(", ")} have been removed`;
+            return `Packages ${packages.join(", ")} have been removed`;
         }, "Could not remove packages");
-    };
+    }, [client, performAction]);
 
     return {
         handleRefreshDatabase,

frontend/src/hooks/usePackageTable.ts

@@ -30,8 +30,8 @@ export interface UsePackageTableResult {
     filterModel: GridFilterModel;
     handleRefreshDatabase: () => Promise<void>;
     handleReload: () => void;
-    handleRemove: () => Promise<void>;
+    handleRemove: (packages: string[]) => Promise<void>;
-    handleUpdate: () => Promise<void>;
+    handleUpdate: (packages: string[]) => Promise<void>;
     isAuthorized: boolean;
     isLoading: boolean;
     paginationModel: { page: number; pageSize: number };
@@ -52,7 +52,7 @@ export interface UsePackageTableResult {
 export function usePackageTable(): UsePackageTableResult {
     const { rows, isLoading, isAuthorized, status } = usePackageData();
     const tableState = useTableState();
-    const actions = usePackageActions(tableState.selectionModel, tableState.setSelectionModel);
+    const actions = usePackageActions();
 
     return {
         isLoading,