mirror of
https://github.com/arcan1s/ahriman.git
synced 2025-11-15 13:03:42 +00:00
Compare commits
21 Commits
2.13.1
...
cd4516d6e8
| Author | SHA1 | Date | |
|---|---|---|---|
| cd4516d6e8 | |||
| 04e10bd9b7 | |||
| 07b77be6b8 | |||
| 2b33510ada | |||
| 6d05389639 | |||
| daf9841717 | |||
| 0d243a781a | |||
| cf2e66a934 | |||
| f01f35238d | |||
| d30d512eb6 | |||
| 0437f90e5a | |||
| 3cab65855a | |||
| ecfb615f97 | |||
| 243983ee64 | |||
| 812c03d1eb | |||
| 01597c531b | |||
| 4fec42eac8 | |||
| 7574b8e5ce | |||
| 0f2e7f45da | |||
| 5956a8720b | |||
| 8dd4ced5e9 |
11
.github/workflows/setup.sh
vendored
11
.github/workflows/setup.sh
vendored
@ -10,9 +10,9 @@ echo -e '[arcanisrepo]\nServer = https://repo.arcanis.me/$arch\nSigLevel = Never
|
|||||||
# refresh the image
|
# refresh the image
|
||||||
pacman -Syu --noconfirm
|
pacman -Syu --noconfirm
|
||||||
# main dependencies
|
# main dependencies
|
||||||
pacman -Sy --noconfirm devtools git pyalpm python-cerberus python-inflection python-passlib python-requests python-srcinfo python-systemd sudo
|
pacman -Sy --noconfirm devtools git pyalpm python-cerberus python-inflection python-passlib python-pyelftools python-requests python-srcinfo python-systemd sudo
|
||||||
# make dependencies
|
# make dependencies
|
||||||
pacman -Sy --noconfirm python-build python-flit python-installer python-tox python-wheel
|
pacman -Sy --noconfirm --asdeps base-devel python-build python-flit python-installer python-tox python-wheel
|
||||||
# optional dependencies
|
# optional dependencies
|
||||||
if [[ -z $MINIMAL_INSTALL ]]; then
|
if [[ -z $MINIMAL_INSTALL ]]; then
|
||||||
# VCS support
|
# VCS support
|
||||||
@ -32,10 +32,13 @@ mv dist/ahriman-*.tar.gz package/archlinux
|
|||||||
chmod +777 package/archlinux # because fuck you that's why
|
chmod +777 package/archlinux # because fuck you that's why
|
||||||
cd package/archlinux
|
cd package/archlinux
|
||||||
sudo -u nobody -- makepkg -cf --skipchecksums --noconfirm
|
sudo -u nobody -- makepkg -cf --skipchecksums --noconfirm
|
||||||
sudo -u nobody -- makepkg --packagelist | pacman -U --noconfirm -
|
sudo -u nobody -- makepkg --packagelist | grep -v -- -debug- | pacman -U --noconfirm -
|
||||||
# create machine-id which is required by build tools
|
# create machine-id which is required by build tools
|
||||||
systemd-machine-id-setup
|
systemd-machine-id-setup
|
||||||
|
|
||||||
|
# remove unused dependencies
|
||||||
|
pacman -Qdtq | pacman -Rscn --noconfirm -
|
||||||
|
|
||||||
# initial setup command as root
|
# initial setup command as root
|
||||||
[[ -z $MINIMAL_INSTALL ]] && WEB_ARGS=("--web-port" "8080")
|
[[ -z $MINIMAL_INSTALL ]] && WEB_ARGS=("--web-port" "8080")
|
||||||
ahriman -a x86_64 -r "github" service-setup --packager "ahriman bot <ahriman@example.com>" "${WEB_ARGS[@]}"
|
ahriman -a x86_64 -r "github" service-setup --packager "ahriman bot <ahriman@example.com>" "${WEB_ARGS[@]}"
|
||||||
@ -50,7 +53,7 @@ if [[ -z $MINIMAL_INSTALL ]]; then
|
|||||||
WEB_PID=$!
|
WEB_PID=$!
|
||||||
fi
|
fi
|
||||||
# add the first package
|
# add the first package
|
||||||
sudo -u ahriman -- ahriman package-add --now ahriman
|
sudo -u ahriman -- ahriman --log-handler console package-add --now ahriman
|
||||||
# check if package was actually installed
|
# check if package was actually installed
|
||||||
test -n "$(find "/var/lib/ahriman/repository/github/x86_64" -name "ahriman*pkg*")"
|
test -n "$(find "/var/lib/ahriman/repository/github/x86_64" -name "ahriman*pkg*")"
|
||||||
# run package check
|
# run package check
|
||||||
|
|||||||
@ -3,7 +3,7 @@ version: 2
|
|||||||
build:
|
build:
|
||||||
os: ubuntu-20.04
|
os: ubuntu-20.04
|
||||||
tools:
|
tools:
|
||||||
python: "3.11"
|
python: "3.12"
|
||||||
|
|
||||||
python:
|
python:
|
||||||
install:
|
install:
|
||||||
|
|||||||
@ -32,10 +32,10 @@ RUN useradd -m -d "/home/build" -s "/usr/bin/nologin" build && \
|
|||||||
COPY "docker/install-aur-package.sh" "/usr/local/bin/install-aur-package"
|
COPY "docker/install-aur-package.sh" "/usr/local/bin/install-aur-package"
|
||||||
## install package dependencies
|
## install package dependencies
|
||||||
## darcs is not installed by reasons, because it requires a lot haskell packages which dramatically increase image size
|
## darcs is not installed by reasons, because it requires a lot haskell packages which dramatically increase image size
|
||||||
RUN pacman -Sy --noconfirm --asdeps devtools git pyalpm python-cerberus python-inflection python-passlib python-requests python-srcinfo && \
|
RUN pacman -Sy --noconfirm --asdeps devtools git pyalpm python-cerberus python-inflection python-passlib python-pyelftools python-requests python-srcinfo && \
|
||||||
pacman -Sy --noconfirm --asdeps python-build python-flit python-installer python-wheel && \
|
pacman -Sy --noconfirm --asdeps base-devel python-build python-flit python-installer python-wheel && \
|
||||||
pacman -Sy --noconfirm --asdeps breezy git mercurial python-aiohttp python-boto3 python-cryptography python-jinja python-requests-unixsocket python-systemd rsync subversion && \
|
pacman -Sy --noconfirm --asdeps breezy git mercurial python-aiohttp python-boto3 python-cryptography python-jinja python-requests-unixsocket python-systemd rsync subversion && \
|
||||||
runuser -u build -- install-aur-package python-aioauth-client python-aiohttp-apispec-git python-aiohttp-cors \
|
runuser -u build -- install-aur-package python-aioauth-client python-webargs python-aiohttp-apispec-git python-aiohttp-cors \
|
||||||
python-aiohttp-jinja2 python-aiohttp-session python-aiohttp-security
|
python-aiohttp-jinja2 python-aiohttp-session python-aiohttp-security
|
||||||
|
|
||||||
## FIXME since 1.0.4 devtools requires dbus to be run, which doesn't work now in container
|
## FIXME since 1.0.4 devtools requires dbus to be run, which doesn't work now in container
|
||||||
|
|||||||
@ -6,7 +6,7 @@ for PACKAGE in "$@"; do
|
|||||||
BUILD_DIR="$(mktemp -d)"
|
BUILD_DIR="$(mktemp -d)"
|
||||||
git clone https://aur.archlinux.org/"$PACKAGE".git "$BUILD_DIR"
|
git clone https://aur.archlinux.org/"$PACKAGE".git "$BUILD_DIR"
|
||||||
cd "$BUILD_DIR"
|
cd "$BUILD_DIR"
|
||||||
makepkg --noconfirm --install --rmdeps --syncdeps
|
makepkg --nocheck --noconfirm --install --rmdeps --syncdeps
|
||||||
cd /
|
cd /
|
||||||
rm -r "$BUILD_DIR"
|
rm -r "$BUILD_DIR"
|
||||||
done
|
done
|
||||||
|
|||||||
File diff suppressed because it is too large
Load Diff
|
Before Width: | Height: | Size: 1.2 MiB After Width: | Height: | Size: 1.1 MiB |
@ -20,6 +20,14 @@ ahriman.core.alpm.pacman module
|
|||||||
:no-undoc-members:
|
:no-undoc-members:
|
||||||
:show-inheritance:
|
:show-inheritance:
|
||||||
|
|
||||||
|
ahriman.core.alpm.pacman\_database module
|
||||||
|
-----------------------------------------
|
||||||
|
|
||||||
|
.. automodule:: ahriman.core.alpm.pacman_database
|
||||||
|
:members:
|
||||||
|
:no-undoc-members:
|
||||||
|
:show-inheritance:
|
||||||
|
|
||||||
ahriman.core.alpm.repo module
|
ahriman.core.alpm.repo module
|
||||||
-----------------------------
|
-----------------------------
|
||||||
|
|
||||||
|
|||||||
@ -108,6 +108,14 @@ ahriman.core.database.migrations.m012\_last\_commit\_sha module
|
|||||||
:no-undoc-members:
|
:no-undoc-members:
|
||||||
:show-inheritance:
|
:show-inheritance:
|
||||||
|
|
||||||
|
ahriman.core.database.migrations.m013\_dependencies module
|
||||||
|
----------------------------------------------------------
|
||||||
|
|
||||||
|
.. automodule:: ahriman.core.database.migrations.m013_dependencies
|
||||||
|
:members:
|
||||||
|
:no-undoc-members:
|
||||||
|
:show-inheritance:
|
||||||
|
|
||||||
Module contents
|
Module contents
|
||||||
---------------
|
---------------
|
||||||
|
|
||||||
|
|||||||
@ -28,6 +28,14 @@ ahriman.core.database.operations.changes\_operations module
|
|||||||
:no-undoc-members:
|
:no-undoc-members:
|
||||||
:show-inheritance:
|
:show-inheritance:
|
||||||
|
|
||||||
|
ahriman.core.database.operations.dependencies\_operations module
|
||||||
|
----------------------------------------------------------------
|
||||||
|
|
||||||
|
.. automodule:: ahriman.core.database.operations.dependencies_operations
|
||||||
|
:members:
|
||||||
|
:no-undoc-members:
|
||||||
|
:show-inheritance:
|
||||||
|
|
||||||
ahriman.core.database.operations.logs\_operations module
|
ahriman.core.database.operations.logs\_operations module
|
||||||
--------------------------------------------------------
|
--------------------------------------------------------
|
||||||
|
|
||||||
|
|||||||
@ -60,6 +60,14 @@ ahriman.models.counters module
|
|||||||
:no-undoc-members:
|
:no-undoc-members:
|
||||||
:show-inheritance:
|
:show-inheritance:
|
||||||
|
|
||||||
|
ahriman.models.dependencies module
|
||||||
|
----------------------------------
|
||||||
|
|
||||||
|
.. automodule:: ahriman.models.dependencies
|
||||||
|
:members:
|
||||||
|
:no-undoc-members:
|
||||||
|
:show-inheritance:
|
||||||
|
|
||||||
ahriman.models.internal\_status module
|
ahriman.models.internal\_status module
|
||||||
--------------------------------------
|
--------------------------------------
|
||||||
|
|
||||||
@ -108,6 +116,14 @@ ahriman.models.package module
|
|||||||
:no-undoc-members:
|
:no-undoc-members:
|
||||||
:show-inheritance:
|
:show-inheritance:
|
||||||
|
|
||||||
|
ahriman.models.package\_archive module
|
||||||
|
--------------------------------------
|
||||||
|
|
||||||
|
.. automodule:: ahriman.models.package_archive
|
||||||
|
:members:
|
||||||
|
:no-undoc-members:
|
||||||
|
:show-inheritance:
|
||||||
|
|
||||||
ahriman.models.package\_description module
|
ahriman.models.package\_description module
|
||||||
------------------------------------------
|
------------------------------------------
|
||||||
|
|
||||||
|
|||||||
61
docs/ahriman.web.views.v1.packages.rst
Normal file
61
docs/ahriman.web.views.v1.packages.rst
Normal file
@ -0,0 +1,61 @@
|
|||||||
|
ahriman.web.views.v1.packages package
|
||||||
|
=====================================
|
||||||
|
|
||||||
|
Submodules
|
||||||
|
----------
|
||||||
|
|
||||||
|
ahriman.web.views.v1.packages.changes module
|
||||||
|
--------------------------------------------
|
||||||
|
|
||||||
|
.. automodule:: ahriman.web.views.v1.packages.changes
|
||||||
|
:members:
|
||||||
|
:no-undoc-members:
|
||||||
|
:show-inheritance:
|
||||||
|
|
||||||
|
ahriman.web.views.v1.packages.logs module
|
||||||
|
-----------------------------------------
|
||||||
|
|
||||||
|
.. automodule:: ahriman.web.views.v1.packages.logs
|
||||||
|
:members:
|
||||||
|
:no-undoc-members:
|
||||||
|
:show-inheritance:
|
||||||
|
|
||||||
|
ahriman.web.views.v1.packages.package module
|
||||||
|
--------------------------------------------
|
||||||
|
|
||||||
|
.. automodule:: ahriman.web.views.v1.packages.package
|
||||||
|
:members:
|
||||||
|
:no-undoc-members:
|
||||||
|
:show-inheritance:
|
||||||
|
|
||||||
|
ahriman.web.views.v1.packages.packages module
|
||||||
|
---------------------------------------------
|
||||||
|
|
||||||
|
.. automodule:: ahriman.web.views.v1.packages.packages
|
||||||
|
:members:
|
||||||
|
:no-undoc-members:
|
||||||
|
:show-inheritance:
|
||||||
|
|
||||||
|
ahriman.web.views.v1.packages.patch module
|
||||||
|
------------------------------------------
|
||||||
|
|
||||||
|
.. automodule:: ahriman.web.views.v1.packages.patch
|
||||||
|
:members:
|
||||||
|
:no-undoc-members:
|
||||||
|
:show-inheritance:
|
||||||
|
|
||||||
|
ahriman.web.views.v1.packages.patches module
|
||||||
|
--------------------------------------------
|
||||||
|
|
||||||
|
.. automodule:: ahriman.web.views.v1.packages.patches
|
||||||
|
:members:
|
||||||
|
:no-undoc-members:
|
||||||
|
:show-inheritance:
|
||||||
|
|
||||||
|
Module contents
|
||||||
|
---------------
|
||||||
|
|
||||||
|
.. automodule:: ahriman.web.views.v1.packages
|
||||||
|
:members:
|
||||||
|
:no-undoc-members:
|
||||||
|
:show-inheritance:
|
||||||
@ -8,6 +8,7 @@ Subpackages
|
|||||||
:maxdepth: 4
|
:maxdepth: 4
|
||||||
|
|
||||||
ahriman.web.views.v1.distributed
|
ahriman.web.views.v1.distributed
|
||||||
|
ahriman.web.views.v1.packages
|
||||||
ahriman.web.views.v1.service
|
ahriman.web.views.v1.service
|
||||||
ahriman.web.views.v1.status
|
ahriman.web.views.v1.status
|
||||||
ahriman.web.views.v1.user
|
ahriman.web.views.v1.user
|
||||||
|
|||||||
@ -4,14 +4,6 @@ ahriman.web.views.v1.status package
|
|||||||
Submodules
|
Submodules
|
||||||
----------
|
----------
|
||||||
|
|
||||||
ahriman.web.views.v1.status.changes module
|
|
||||||
------------------------------------------
|
|
||||||
|
|
||||||
.. automodule:: ahriman.web.views.v1.status.changes
|
|
||||||
:members:
|
|
||||||
:no-undoc-members:
|
|
||||||
:show-inheritance:
|
|
||||||
|
|
||||||
ahriman.web.views.v1.status.info module
|
ahriman.web.views.v1.status.info module
|
||||||
---------------------------------------
|
---------------------------------------
|
||||||
|
|
||||||
@ -20,46 +12,6 @@ ahriman.web.views.v1.status.info module
|
|||||||
:no-undoc-members:
|
:no-undoc-members:
|
||||||
:show-inheritance:
|
:show-inheritance:
|
||||||
|
|
||||||
ahriman.web.views.v1.status.logs module
|
|
||||||
---------------------------------------
|
|
||||||
|
|
||||||
.. automodule:: ahriman.web.views.v1.status.logs
|
|
||||||
:members:
|
|
||||||
:no-undoc-members:
|
|
||||||
:show-inheritance:
|
|
||||||
|
|
||||||
ahriman.web.views.v1.status.package module
|
|
||||||
------------------------------------------
|
|
||||||
|
|
||||||
.. automodule:: ahriman.web.views.v1.status.package
|
|
||||||
:members:
|
|
||||||
:no-undoc-members:
|
|
||||||
:show-inheritance:
|
|
||||||
|
|
||||||
ahriman.web.views.v1.status.packages module
|
|
||||||
-------------------------------------------
|
|
||||||
|
|
||||||
.. automodule:: ahriman.web.views.v1.status.packages
|
|
||||||
:members:
|
|
||||||
:no-undoc-members:
|
|
||||||
:show-inheritance:
|
|
||||||
|
|
||||||
ahriman.web.views.v1.status.patch module
|
|
||||||
----------------------------------------
|
|
||||||
|
|
||||||
.. automodule:: ahriman.web.views.v1.status.patch
|
|
||||||
:members:
|
|
||||||
:no-undoc-members:
|
|
||||||
:show-inheritance:
|
|
||||||
|
|
||||||
ahriman.web.views.v1.status.patches module
|
|
||||||
------------------------------------------
|
|
||||||
|
|
||||||
.. automodule:: ahriman.web.views.v1.status.patches
|
|
||||||
:members:
|
|
||||||
:no-undoc-members:
|
|
||||||
:show-inheritance:
|
|
||||||
|
|
||||||
ahriman.web.views.v1.status.repositories module
|
ahriman.web.views.v1.status.repositories module
|
||||||
-----------------------------------------------
|
-----------------------------------------------
|
||||||
|
|
||||||
|
|||||||
21
docs/ahriman.web.views.v2.packages.rst
Normal file
21
docs/ahriman.web.views.v2.packages.rst
Normal file
@ -0,0 +1,21 @@
|
|||||||
|
ahriman.web.views.v2.packages package
|
||||||
|
=====================================
|
||||||
|
|
||||||
|
Submodules
|
||||||
|
----------
|
||||||
|
|
||||||
|
ahriman.web.views.v2.packages.logs module
|
||||||
|
-----------------------------------------
|
||||||
|
|
||||||
|
.. automodule:: ahriman.web.views.v2.packages.logs
|
||||||
|
:members:
|
||||||
|
:no-undoc-members:
|
||||||
|
:show-inheritance:
|
||||||
|
|
||||||
|
Module contents
|
||||||
|
---------------
|
||||||
|
|
||||||
|
.. automodule:: ahriman.web.views.v2.packages
|
||||||
|
:members:
|
||||||
|
:no-undoc-members:
|
||||||
|
:show-inheritance:
|
||||||
@ -7,7 +7,7 @@ Subpackages
|
|||||||
.. toctree::
|
.. toctree::
|
||||||
:maxdepth: 4
|
:maxdepth: 4
|
||||||
|
|
||||||
ahriman.web.views.v2.status
|
ahriman.web.views.v2.packages
|
||||||
|
|
||||||
Module contents
|
Module contents
|
||||||
---------------
|
---------------
|
||||||
|
|||||||
@ -1,21 +0,0 @@
|
|||||||
ahriman.web.views.v2.status package
|
|
||||||
===================================
|
|
||||||
|
|
||||||
Submodules
|
|
||||||
----------
|
|
||||||
|
|
||||||
ahriman.web.views.v2.status.logs module
|
|
||||||
---------------------------------------
|
|
||||||
|
|
||||||
.. automodule:: ahriman.web.views.v2.status.logs
|
|
||||||
:members:
|
|
||||||
:no-undoc-members:
|
|
||||||
:show-inheritance:
|
|
||||||
|
|
||||||
Module contents
|
|
||||||
---------------
|
|
||||||
|
|
||||||
.. automodule:: ahriman.web.views.v2.status
|
|
||||||
:members:
|
|
||||||
:no-undoc-members:
|
|
||||||
:show-inheritance:
|
|
||||||
@ -53,6 +53,7 @@ libalpm and AUR related configuration. Group name can refer to architecture, e.g
|
|||||||
* ``mirror`` - package database mirror used by pacman for synchronization, string, required. This option supports standard pacman substitutions with ``$arch`` and ``$repo``. Note that the mentioned mirror should contain all repositories which are set by ``alpm.repositories`` option.
|
* ``mirror`` - package database mirror used by pacman for synchronization, string, required. This option supports standard pacman substitutions with ``$arch`` and ``$repo``. Note that the mentioned mirror should contain all repositories which are set by ``alpm.repositories`` option.
|
||||||
* ``repositories`` - list of pacman repositories, used for package search, space separated list of strings, required.
|
* ``repositories`` - list of pacman repositories, used for package search, space separated list of strings, required.
|
||||||
* ``root`` - root for alpm library, string, required. In the most cases it must point to the system root.
|
* ``root`` - root for alpm library, string, required. In the most cases it must point to the system root.
|
||||||
|
* ``sync_files_database`` - download files database from mirror, boolean, required.
|
||||||
* ``use_ahriman_cache`` - use local pacman package cache instead of system one, boolean, required. With this option enabled you might want to refresh database periodically (available as additional flag for some subcommands). If set to ``no``, databases must be synchronized manually.
|
* ``use_ahriman_cache`` - use local pacman package cache instead of system one, boolean, required. With this option enabled you might want to refresh database periodically (available as additional flag for some subcommands). If set to ``no``, databases must be synchronized manually.
|
||||||
|
|
||||||
``auth`` group
|
``auth`` group
|
||||||
@ -81,6 +82,7 @@ Build related configuration. Group name can refer to architecture, e.g. ``build:
|
|||||||
* ``archbuild_flags`` - additional flags passed to ``archbuild`` command, space separated list of strings, optional.
|
* ``archbuild_flags`` - additional flags passed to ``archbuild`` command, space separated list of strings, optional.
|
||||||
* ``build_command`` - default build command, string, required.
|
* ``build_command`` - default build command, string, required.
|
||||||
* ``ignore_packages`` - list packages to ignore during a regular update (manual update will still work), space separated list of strings, optional.
|
* ``ignore_packages`` - list packages to ignore during a regular update (manual update will still work), space separated list of strings, optional.
|
||||||
|
* ``include_debug_packages`` - distribute debug packages, boolean, optional, default ``yes``.
|
||||||
* ``makepkg_flags`` - additional flags passed to ``makepkg`` command, space separated list of strings, optional.
|
* ``makepkg_flags`` - additional flags passed to ``makepkg`` command, space separated list of strings, optional.
|
||||||
* ``makechrootpkg_flags`` - additional flags passed to ``makechrootpkg`` command, space separated list of strings, optional.
|
* ``makechrootpkg_flags`` - additional flags passed to ``makechrootpkg`` command, space separated list of strings, optional.
|
||||||
* ``triggers`` - list of ``ahriman.core.triggers.Trigger`` class implementation (e.g. ``ahriman.core.report.ReportTrigger ahriman.core.upload.UploadTrigger``) which will be loaded and run at the end of processing, space separated list of strings, optional. You can also specify triggers by their paths, e.g. ``/usr/lib/python3.10/site-packages/ahriman/core/report/report.py.ReportTrigger``. Triggers are run in the order of definition.
|
* ``triggers`` - list of ``ahriman.core.triggers.Trigger`` class implementation (e.g. ``ahriman.core.report.ReportTrigger ahriman.core.upload.UploadTrigger``) which will be loaded and run at the end of processing, space separated list of strings, optional. You can also specify triggers by their paths, e.g. ``/usr/lib/python3.10/site-packages/ahriman/core/report/report.py.ReportTrigger``. Triggers are run in the order of definition.
|
||||||
|
|||||||
12
docs/faq.rst
12
docs/faq.rst
@ -208,6 +208,18 @@ This command will prompt for new value of the PKGBUILD variable ``version``. You
|
|||||||
|
|
||||||
sudo -u ahriman ahriman patch-add ahriman version version.patch
|
sudo -u ahriman ahriman patch-add ahriman version version.patch
|
||||||
|
|
||||||
|
The command also supports arrays, but in this case you need to specify full array, e.g.
|
||||||
|
|
||||||
|
.. code-block:: shell
|
||||||
|
|
||||||
|
sudo -u ahriman ahriman patch-add ahriman depends
|
||||||
|
|
||||||
|
Post new function or variable value below. Press Ctrl-D to finish:
|
||||||
|
(python python-aiohttp)
|
||||||
|
^D
|
||||||
|
|
||||||
|
will set depends PKGBUILD variable (exactly) to array ``["python", "python-aiohttp"]``.
|
||||||
|
|
||||||
Alternatively you can create full-diff patches, which are calculated by using ``git diff`` from current PKGBUILD master branch:
|
Alternatively you can create full-diff patches, which are calculated by using ``git diff`` from current PKGBUILD master branch:
|
||||||
|
|
||||||
#.
|
#.
|
||||||
|
|||||||
@ -1,13 +1,13 @@
|
|||||||
# Maintainer: Evgeniy Alekseev
|
# Maintainer: Evgeniy Alekseev
|
||||||
|
|
||||||
pkgname='ahriman'
|
pkgname='ahriman'
|
||||||
pkgver=2.13.1
|
pkgver=2.13.7
|
||||||
pkgrel=1
|
pkgrel=1
|
||||||
pkgdesc="ArcH linux ReposItory MANager"
|
pkgdesc="ArcH linux ReposItory MANager"
|
||||||
arch=('any')
|
arch=('any')
|
||||||
url="https://github.com/arcan1s/ahriman"
|
url="https://github.com/arcan1s/ahriman"
|
||||||
license=('GPL3')
|
license=('GPL3')
|
||||||
depends=('devtools>=1:1.0.0' 'git' 'pyalpm' 'python-cerberus' 'python-inflection' 'python-passlib' 'python-requests' 'python-srcinfo')
|
depends=('devtools>=1:1.0.0' 'git' 'pyalpm' 'python-cerberus' 'python-inflection' 'python-passlib' 'python-pyelftools' 'python-requests' 'python-srcinfo')
|
||||||
makedepends=('python-build' 'python-flit' 'python-installer' 'python-wheel')
|
makedepends=('python-build' 'python-flit' 'python-installer' 'python-wheel')
|
||||||
optdepends=('breezy: -bzr packages support'
|
optdepends=('breezy: -bzr packages support'
|
||||||
'darcs: -darcs packages support'
|
'darcs: -darcs packages support'
|
||||||
|
|||||||
@ -17,6 +17,8 @@ mirror = https://geo.mirror.pkgbuild.com/$repo/os/$arch
|
|||||||
repositories = core extra multilib
|
repositories = core extra multilib
|
||||||
; Pacman's root directory. In the most cases it must point to the system root.
|
; Pacman's root directory. In the most cases it must point to the system root.
|
||||||
root = /
|
root = /
|
||||||
|
; Sync files databases too, which is required by deep dependencies check
|
||||||
|
sync_files_database = yes
|
||||||
; Use local packages cache. If this option is enabled, the service will be able to synchronize databases (available
|
; Use local packages cache. If this option is enabled, the service will be able to synchronize databases (available
|
||||||
; as additional option for some subcommands). If set to no, databases must be synchronized manually.
|
; as additional option for some subcommands). If set to no, databases must be synchronized manually.
|
||||||
use_ahriman_cache = yes
|
use_ahriman_cache = yes
|
||||||
@ -46,8 +48,12 @@ allow_read_only = yes
|
|||||||
[build]
|
[build]
|
||||||
; List of additional flags passed to archbuild command.
|
; List of additional flags passed to archbuild command.
|
||||||
;archbuild_flags =
|
;archbuild_flags =
|
||||||
|
; Path to build command
|
||||||
|
;build_command =
|
||||||
; List of packages to be ignored during automatic updates.
|
; List of packages to be ignored during automatic updates.
|
||||||
;ignore_packages =
|
;ignore_packages =
|
||||||
|
; Include debug packages
|
||||||
|
;include_debug_packages = yes
|
||||||
; List of additional flags passed to makechrootpkg command.
|
; List of additional flags passed to makechrootpkg command.
|
||||||
;makechrootpkg_flags =
|
;makechrootpkg_flags =
|
||||||
; List of additional flags passed to makepkg command.
|
; List of additional flags passed to makepkg command.
|
||||||
|
|||||||
@ -15,7 +15,7 @@
|
|||||||
|
|
||||||
<div class="container">
|
<div class="container">
|
||||||
<nav class="navbar navbar-expand-lg">
|
<nav class="navbar navbar-expand-lg">
|
||||||
<div class="navbar-brand"><img src="/static/logo.svg" width="30" height="30" alt=""> ahriman</div>
|
<div class="navbar-brand"><img src="/static/logo.svg" width="30" height="30" alt=""></div>
|
||||||
<button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#repositories-navbar-supported-content" aria-controls="repositories-navbar-supported-content" aria-expanded="false" aria-label="Toggle navigation">
|
<button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#repositories-navbar-supported-content" aria-controls="repositories-navbar-supported-content" aria-expanded="false" aria-label="Toggle navigation">
|
||||||
<span class="navbar-toggler-icon"></span>
|
<span class="navbar-toggler-icon"></span>
|
||||||
</button>
|
</button>
|
||||||
|
|||||||
@ -38,10 +38,6 @@
|
|||||||
<script>
|
<script>
|
||||||
const keyImportModal = $("#key-import-modal");
|
const keyImportModal = $("#key-import-modal");
|
||||||
const keyImportForm = $("#key-import-form");
|
const keyImportForm = $("#key-import-form");
|
||||||
keyImportModal.on("hidden.bs.modal", () => {
|
|
||||||
keyImportBodyInput.text("");
|
|
||||||
keyImportForm.trigger("reset");
|
|
||||||
});
|
|
||||||
|
|
||||||
const keyImportBodyInput = $("#key-import-body-input");
|
const keyImportBodyInput = $("#key-import-body-input");
|
||||||
const keyImportCopyButton = $("#key-import-copy-button");
|
const keyImportCopyButton = $("#key-import-copy-button");
|
||||||
@ -90,4 +86,11 @@
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
$(() => {
|
||||||
|
keyImportModal.on("hidden.bs.modal", () => {
|
||||||
|
keyImportBodyInput.text("");
|
||||||
|
keyImportForm.trigger("reset");
|
||||||
|
});
|
||||||
|
});
|
||||||
</script>
|
</script>
|
||||||
|
|||||||
@ -36,9 +36,6 @@
|
|||||||
<script>
|
<script>
|
||||||
const loginModal = $("#login-modal");
|
const loginModal = $("#login-modal");
|
||||||
const loginForm = $("#login-form");
|
const loginForm = $("#login-form");
|
||||||
loginModal.on("hidden.bs.modal", () => {
|
|
||||||
loginForm.trigger("reset");
|
|
||||||
});
|
|
||||||
|
|
||||||
const loginPasswordInput = $("#login-password");
|
const loginPasswordInput = $("#login-password");
|
||||||
const loginUsernameInput = $("#login-username");
|
const loginUsernameInput = $("#login-username");
|
||||||
@ -77,4 +74,10 @@
|
|||||||
showHidePasswordButton.addClass("bi-eye");
|
showHidePasswordButton.addClass("bi-eye");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
$(() => {
|
||||||
|
loginModal.on("hidden.bs.modal", () => {
|
||||||
|
loginForm.trigger("reset");
|
||||||
|
});
|
||||||
|
});
|
||||||
</script>
|
</script>
|
||||||
|
|||||||
@ -43,41 +43,10 @@
|
|||||||
<script>
|
<script>
|
||||||
const packageAddModal = $("#package-add-modal");
|
const packageAddModal = $("#package-add-modal");
|
||||||
const packageAddForm = $("#package-add-form");
|
const packageAddForm = $("#package-add-form");
|
||||||
packageAddModal.on("shown.bs.modal", () => {
|
|
||||||
$(`#package-add-repository-input option[value="${repository.architecture}-${repository.repository}"]`).prop("selected", true);
|
|
||||||
});
|
|
||||||
packageAddModal.on("hidden.bs.modal", () => {
|
|
||||||
packageAddVariablesDiv.empty();
|
|
||||||
packageAddForm.trigger("reset");
|
|
||||||
});
|
|
||||||
|
|
||||||
const packageAddInput = $("#package-add-input");
|
const packageAddInput = $("#package-add-input");
|
||||||
const packageAddRepositoryInput = $("#package-add-repository-input");
|
const packageAddRepositoryInput = $("#package-add-repository-input");
|
||||||
const packageAddKnownPackagesList = $("#package-add-known-packages-dlist");
|
const packageAddKnownPackagesList = $("#package-add-known-packages-dlist");
|
||||||
packageAddInput.keyup(() => {
|
|
||||||
clearTimeout(packageAddInput.data("timeout"));
|
|
||||||
packageAddInput.data("timeout", setTimeout($.proxy(() => {
|
|
||||||
const value = packageAddInput.val();
|
|
||||||
|
|
||||||
if (value.length >= 3) {
|
|
||||||
$.ajax({
|
|
||||||
url: "/api/v1/service/search",
|
|
||||||
data: {"for": value},
|
|
||||||
type: "GET",
|
|
||||||
dataType: "json",
|
|
||||||
success: response => {
|
|
||||||
const options = response.map(pkg => {
|
|
||||||
const option = document.createElement("option");
|
|
||||||
option.value = pkg.package;
|
|
||||||
option.innerText = `${pkg.package} (${pkg.description})`;
|
|
||||||
return option;
|
|
||||||
});
|
|
||||||
packageAddKnownPackagesList.empty().append(options);
|
|
||||||
},
|
|
||||||
});
|
|
||||||
}
|
|
||||||
}, this), 500));
|
|
||||||
});
|
|
||||||
|
|
||||||
const packageAddVariablesDiv = $("#package-add-variables-div");
|
const packageAddVariablesDiv = $("#package-add-variables-div");
|
||||||
|
|
||||||
@ -156,4 +125,39 @@
|
|||||||
doPackageAction("/api/v1/service/request", [packages], repository, onSuccess, onFailure, patches);
|
doPackageAction("/api/v1/service/request", [packages], repository, onSuccess, onFailure, patches);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
$(() => {
|
||||||
|
packageAddModal.on("shown.bs.modal", () => {
|
||||||
|
$(`#package-add-repository-input option[value="${repository.architecture}-${repository.repository}"]`).prop("selected", true);
|
||||||
|
});
|
||||||
|
packageAddModal.on("hidden.bs.modal", () => {
|
||||||
|
packageAddVariablesDiv.empty();
|
||||||
|
packageAddForm.trigger("reset");
|
||||||
|
});
|
||||||
|
|
||||||
|
packageAddInput.keyup(() => {
|
||||||
|
clearTimeout(packageAddInput.data("timeout"));
|
||||||
|
packageAddInput.data("timeout", setTimeout($.proxy(() => {
|
||||||
|
const value = packageAddInput.val();
|
||||||
|
|
||||||
|
if (value.length >= 3) {
|
||||||
|
$.ajax({
|
||||||
|
url: "/api/v1/service/search",
|
||||||
|
data: {"for": value},
|
||||||
|
type: "GET",
|
||||||
|
dataType: "json",
|
||||||
|
success: response => {
|
||||||
|
const options = response.map(pkg => {
|
||||||
|
const option = document.createElement("option");
|
||||||
|
option.value = pkg.package;
|
||||||
|
option.innerText = `${pkg.package} (${pkg.description})`;
|
||||||
|
return option;
|
||||||
|
});
|
||||||
|
packageAddKnownPackagesList.empty().append(options);
|
||||||
|
},
|
||||||
|
});
|
||||||
|
}
|
||||||
|
}, this), 500));
|
||||||
|
});
|
||||||
|
});
|
||||||
</script>
|
</script>
|
||||||
|
|||||||
@ -72,26 +72,6 @@
|
|||||||
const packageInfoModal = $("#package-info-modal");
|
const packageInfoModal = $("#package-info-modal");
|
||||||
const packageInfoModalHeader = $("#package-info-modal-header");
|
const packageInfoModalHeader = $("#package-info-modal-header");
|
||||||
const packageInfo = $("#package-info");
|
const packageInfo = $("#package-info");
|
||||||
packageInfoModal.on("hidden.bs.modal", () => {
|
|
||||||
packageInfoAurUrl.empty();
|
|
||||||
packageInfoDepends.empty();
|
|
||||||
packageInfoGroups.empty();
|
|
||||||
packageInfoLicenses.empty();
|
|
||||||
packageInfoPackager.empty();
|
|
||||||
packageInfoPackages.empty();
|
|
||||||
packageInfoUpstreamUrl.empty();
|
|
||||||
packageInfoVersion.empty();
|
|
||||||
|
|
||||||
packageInfoVariablesBlock.attr("hidden", true);
|
|
||||||
packageInfoVariablesDiv.empty();
|
|
||||||
|
|
||||||
packageInfoLogsInput.empty();
|
|
||||||
packageInfoChangesInput.empty();
|
|
||||||
|
|
||||||
packageInfoModal.trigger("reset");
|
|
||||||
|
|
||||||
hideInfoControls(true);
|
|
||||||
});
|
|
||||||
|
|
||||||
const packageInfoLogsInput = $("#package-info-logs-input");
|
const packageInfoLogsInput = $("#package-info-logs-input");
|
||||||
const packageInfoLogsCopyButton = $("#package-info-logs-copy-button");
|
const packageInfoLogsCopyButton = $("#package-info-logs-copy-button");
|
||||||
@ -309,4 +289,27 @@
|
|||||||
|
|
||||||
if (isPackageBaseSet) packageInfoModal.modal("show");
|
if (isPackageBaseSet) packageInfoModal.modal("show");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
$(() => {
|
||||||
|
packageInfoModal.on("hidden.bs.modal", () => {
|
||||||
|
packageInfoAurUrl.empty();
|
||||||
|
packageInfoDepends.empty();
|
||||||
|
packageInfoGroups.empty();
|
||||||
|
packageInfoLicenses.empty();
|
||||||
|
packageInfoPackager.empty();
|
||||||
|
packageInfoPackages.empty();
|
||||||
|
packageInfoUpstreamUrl.empty();
|
||||||
|
packageInfoVersion.empty();
|
||||||
|
|
||||||
|
packageInfoVariablesBlock.attr("hidden", true);
|
||||||
|
packageInfoVariablesDiv.empty();
|
||||||
|
|
||||||
|
packageInfoLogsInput.empty();
|
||||||
|
packageInfoChangesInput.empty();
|
||||||
|
|
||||||
|
packageInfoModal.trigger("reset");
|
||||||
|
|
||||||
|
hideInfoControls(true);
|
||||||
|
});
|
||||||
|
});
|
||||||
</script>
|
</script>
|
||||||
|
|||||||
@ -35,11 +35,6 @@
|
|||||||
<script>
|
<script>
|
||||||
const packageRebuildModal = $("#package-rebuild-modal");
|
const packageRebuildModal = $("#package-rebuild-modal");
|
||||||
const packageRebuildForm = $("#package-rebuild-form");
|
const packageRebuildForm = $("#package-rebuild-form");
|
||||||
packageRebuildModal.on("shown.bs.modal", () => {
|
|
||||||
$(`#package-rebuild-repository-input option[value="${repository.architecture}-${repository.repository}"]`).prop("selected", true);
|
|
||||||
|
|
||||||
});
|
|
||||||
packageRebuildModal.on("hidden.bs.modal", () => { packageRebuildForm.trigger("reset"); });
|
|
||||||
|
|
||||||
const packageRebuildDependencyInput = $("#package-rebuild-dependency-input");
|
const packageRebuildDependencyInput = $("#package-rebuild-dependency-input");
|
||||||
const packageRebuildRepositoryInput = $("#package-rebuild-repository-input");
|
const packageRebuildRepositoryInput = $("#package-rebuild-repository-input");
|
||||||
@ -54,4 +49,12 @@
|
|||||||
doPackageAction("/api/v1/service/rebuild", [packages], repository, onSuccess, onFailure);
|
doPackageAction("/api/v1/service/rebuild", [packages], repository, onSuccess, onFailure);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
$(() => {
|
||||||
|
packageRebuildModal.on("shown.bs.modal", () => {
|
||||||
|
$(`#package-rebuild-repository-input option[value="${repository.architecture}-${repository.repository}"]`).prop("selected", true);
|
||||||
|
|
||||||
|
});
|
||||||
|
packageRebuildModal.on("hidden.bs.modal", () => { packageRebuildForm.trigger("reset"); });
|
||||||
|
});
|
||||||
</script>
|
</script>
|
||||||
|
|||||||
@ -9,46 +9,8 @@
|
|||||||
const packageInfoUpdateButton = $("#package-info-update-button");
|
const packageInfoUpdateButton = $("#package-info-update-button");
|
||||||
|
|
||||||
let repository = null;
|
let repository = null;
|
||||||
$("#repositories a").on("click", (event) => {
|
|
||||||
const element = event.target;
|
|
||||||
repository = {
|
|
||||||
architecture: element.dataset.architecture,
|
|
||||||
repository: element.dataset.repository,
|
|
||||||
};
|
|
||||||
packageUpdateButton.html(`<i class="bi bi-play"></i> update<span class="d-none d-sm-inline"> ${safe(repository.repository)} (${safe(repository.architecture)})</span>`);
|
|
||||||
$(`#${element.id}`).tab("show");
|
|
||||||
reload();
|
|
||||||
});
|
|
||||||
|
|
||||||
const table = $("#packages");
|
const table = $("#packages");
|
||||||
table.on("check.bs.table uncheck.bs.table check-all.bs.table uncheck-all.bs.table", () => {
|
|
||||||
packageRemoveButton.prop("disabled", !table.bootstrapTable("getSelections").length);
|
|
||||||
});
|
|
||||||
table.on("click-row.bs.table", (self, data, row, cell) => {
|
|
||||||
if (0 === cell || "base" === cell) {
|
|
||||||
const method = data[0] === true ? "uncheckBy" : "checkBy"; // fck javascript
|
|
||||||
table.bootstrapTable(method, {field: "id", values: [data.id]});
|
|
||||||
} else showPackageInfo(data.id);
|
|
||||||
});
|
|
||||||
table.on("created-controls.bs.table", () => {
|
|
||||||
const pickerInput = $(".bootstrap-table-filter-control-timestamp");
|
|
||||||
pickerInput.daterangepicker({
|
|
||||||
autoUpdateInput: false,
|
|
||||||
locale: {
|
|
||||||
cancelLabel: "Clear",
|
|
||||||
},
|
|
||||||
});
|
|
||||||
|
|
||||||
pickerInput.on("apply.daterangepicker", (event, picker) => {
|
|
||||||
pickerInput.val(`${picker.startDate.format("YYYY-MM-DD")} - ${picker.endDate.format("YYYY-MM-DD")}`);
|
|
||||||
table.bootstrapTable("triggerSearch");
|
|
||||||
});
|
|
||||||
|
|
||||||
pickerInput.on("cancel.daterangepicker", () => {
|
|
||||||
pickerInput.val("");
|
|
||||||
table.bootstrapTable("triggerSearch");
|
|
||||||
});
|
|
||||||
});
|
|
||||||
|
|
||||||
const statusBadge = $("#badge-status");
|
const statusBadge = $("#badge-status");
|
||||||
const versionBadge = $("#badge-version");
|
const versionBadge = $("#badge-version");
|
||||||
@ -221,7 +183,46 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
$(() => {
|
$(() => {
|
||||||
table.bootstrapTable({});
|
$("#repositories a").on("click", event => {
|
||||||
|
const element = event.target;
|
||||||
|
repository = {
|
||||||
|
architecture: element.dataset.architecture,
|
||||||
|
repository: element.dataset.repository,
|
||||||
|
};
|
||||||
|
packageUpdateButton.html(`<i class="bi bi-play"></i> update<span class="d-none d-sm-inline"> ${safe(repository.repository)} (${safe(repository.architecture)})</span>`);
|
||||||
|
$(`#${element.id}`).tab("show");
|
||||||
|
reload();
|
||||||
|
});
|
||||||
|
|
||||||
|
table.on("check.bs.table uncheck.bs.table check-all.bs.table uncheck-all.bs.table", () => {
|
||||||
|
packageRemoveButton.prop("disabled", !table.bootstrapTable("getSelections").length);
|
||||||
|
});
|
||||||
|
table.on("click-row.bs.table", (self, data, row, cell) => {
|
||||||
|
if (0 === cell || "base" === cell) {
|
||||||
|
const method = data[0] === true ? "uncheckBy" : "checkBy"; // fck javascript
|
||||||
|
table.bootstrapTable(method, {field: "id", values: [data.id]});
|
||||||
|
} else showPackageInfo(data.id);
|
||||||
|
});
|
||||||
|
table.on("created-controls.bs.table", () => {
|
||||||
|
const pickerInput = $(".bootstrap-table-filter-control-timestamp");
|
||||||
|
pickerInput.daterangepicker({
|
||||||
|
autoUpdateInput: false,
|
||||||
|
locale: {
|
||||||
|
cancelLabel: "Clear",
|
||||||
|
},
|
||||||
|
});
|
||||||
|
|
||||||
|
pickerInput.on("apply.daterangepicker", (event, picker) => {
|
||||||
|
pickerInput.val(`${picker.startDate.format("YYYY-MM-DD")} - ${picker.endDate.format("YYYY-MM-DD")}`);
|
||||||
|
table.bootstrapTable("triggerSearch");
|
||||||
|
});
|
||||||
|
|
||||||
|
pickerInput.on("cancel.daterangepicker", () => {
|
||||||
|
pickerInput.val("");
|
||||||
|
table.bootstrapTable("triggerSearch");
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
statusBadge.popover();
|
statusBadge.popover();
|
||||||
selectRepository();
|
selectRepository();
|
||||||
});
|
});
|
||||||
|
|||||||
@ -102,25 +102,6 @@ SigLevel = Database{% if has_repo_signed %}Required{% else %}Never{% endif %} Pa
|
|||||||
|
|
||||||
<script>
|
<script>
|
||||||
const table = $("#packages");
|
const table = $("#packages");
|
||||||
table.on("created-controls.bs.table", () => {
|
|
||||||
const pickerInput = $(".bootstrap-table-filter-control-timestamp");
|
|
||||||
pickerInput.daterangepicker({
|
|
||||||
autoUpdateInput: false,
|
|
||||||
locale: {
|
|
||||||
cancelLabel: "Clear",
|
|
||||||
},
|
|
||||||
});
|
|
||||||
|
|
||||||
pickerInput.on("apply.daterangepicker", (event, picker) => {
|
|
||||||
pickerInput.val(`${picker.startDate.format("YYYY-MM-DD")} - ${picker.endDate.format("YYYY-MM-DD")}`);
|
|
||||||
table.bootstrapTable("triggerSearch");
|
|
||||||
});
|
|
||||||
|
|
||||||
pickerInput.on("cancel.daterangepicker", () => {
|
|
||||||
pickerInput.val("");
|
|
||||||
table.bootstrapTable("triggerSearch");
|
|
||||||
});
|
|
||||||
});
|
|
||||||
|
|
||||||
const pacmanConf = $("#pacman-conf");
|
const pacmanConf = $("#pacman-conf");
|
||||||
const pacmanConfCopyButton = $("#copy-btn");
|
const pacmanConfCopyButton = $("#copy-btn");
|
||||||
@ -141,6 +122,28 @@ SigLevel = Database{% if has_repo_signed %}Required{% else %}Never{% endif %} Pa
|
|||||||
function filterListLicenses() {
|
function filterListLicenses() {
|
||||||
return extractDataList(table.bootstrapTable("getData"), "licenses");
|
return extractDataList(table.bootstrapTable("getData"), "licenses");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
$(() => {
|
||||||
|
table.on("created-controls.bs.table", () => {
|
||||||
|
const pickerInput = $(".bootstrap-table-filter-control-timestamp");
|
||||||
|
pickerInput.daterangepicker({
|
||||||
|
autoUpdateInput: false,
|
||||||
|
locale: {
|
||||||
|
cancelLabel: "Clear",
|
||||||
|
},
|
||||||
|
});
|
||||||
|
|
||||||
|
pickerInput.on("apply.daterangepicker", (event, picker) => {
|
||||||
|
pickerInput.val(`${picker.startDate.format("YYYY-MM-DD")} - ${picker.endDate.format("YYYY-MM-DD")}`);
|
||||||
|
table.bootstrapTable("triggerSearch");
|
||||||
|
});
|
||||||
|
|
||||||
|
pickerInput.on("cancel.daterangepicker", () => {
|
||||||
|
pickerInput.val("");
|
||||||
|
table.bootstrapTable("triggerSearch");
|
||||||
|
});
|
||||||
|
});
|
||||||
|
});
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
</body>
|
</body>
|
||||||
|
|||||||
@ -1,7 +1,7 @@
|
|||||||
<script src="https://cdn.jsdelivr.net/npm/jquery@3.7.1/dist/jquery.min.js" integrity="sha384-1H217gwSVyLSIfaLxHbE7dRb3v4mYCKbpQvzx0cegeju1MVsGrX5xXxAvs/HgeFs" crossorigin="anonymous" type="application/javascript"></script>
|
<script src="https://cdn.jsdelivr.net/npm/jquery@3.7.1/dist/jquery.min.js" integrity="sha384-1H217gwSVyLSIfaLxHbE7dRb3v4mYCKbpQvzx0cegeju1MVsGrX5xXxAvs/HgeFs" crossorigin="anonymous" type="application/javascript"></script>
|
||||||
|
|
||||||
<script src="https://cdn.jsdelivr.net/npm/moment@2.29.4/moment.min.js" integrity="sha384-8hHkOkbWN1TLWwet/jpbJ0zbx3FJDeYJgQ8dX1mRrv/vfCfHCqFSFZYCgaMML3z9" crossorigin="anonymous" type="application/javascript"></script>
|
<script src="https://cdn.jsdelivr.net/npm/moment@2.29.4/moment.min.js" integrity="sha384-4ZTAzTbfB8H7hkWtXbyNDzDvxirmBT7EmURIvfOJ3Foympc+OD9p+bZNNENaJXgW" crossorigin="anonymous" type="application/javascript"></script>
|
||||||
<script src="https://cdn.jsdelivr.net/npm/daterangepicker@3.1.0/daterangepicker.min.js" integrity="sha384-u4eJN1VWrTf/FnYYQJo2kqJyVxEQf5UmWY4iUcNAoLenOEtEuCkfwc5bKvZOWBi5" crossorigin="anonymous" type="application/javascript"></script>
|
<script src="https://cdn.jsdelivr.net/npm/daterangepicker@3.1.0/daterangepicker.min.js" integrity="sha384-Gn1XZMJEKL3ycoWq97jYAl+FP3vXQYE2ObBgzgcPMKOZdUZdF6ZuyUxbGC2bAnUT" crossorigin="anonymous" type="application/javascript"></script>
|
||||||
|
|
||||||
<script src="https://cdn.jsdelivr.net/npm/tableexport.jquery.plugin@1.28.0/tableExport.min.js" integrity="sha384-1Rz4Kz/y1rSWw+ZsjTcxB684XgofbO8iizY+UFIzCwFeQ+QUyhBNWBMh/STOyomI" crossorigin="anonymous" type="application/javascript"></script>
|
<script src="https://cdn.jsdelivr.net/npm/tableexport.jquery.plugin@1.28.0/tableExport.min.js" integrity="sha384-1Rz4Kz/y1rSWw+ZsjTcxB684XgofbO8iizY+UFIzCwFeQ+QUyhBNWBMh/STOyomI" crossorigin="anonymous" type="application/javascript"></script>
|
||||||
|
|
||||||
|
|||||||
@ -27,12 +27,12 @@ _shtab_ahriman_patch_list_option_strings=('-h' '--help' '-e' '--exit-code' '-v'
|
|||||||
_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_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' '-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_check_option_strings=('-h' '--help' '--changes' '--no-changes' '-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_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' '--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_daemon_option_strings=('-h' '--help' '-i' '--interval' '--aur' '--no-aur' '--changes' '--no-changes' '--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_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_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_repo_remove_unknown_option_strings=('-h' '--help' '--dry-run')
|
_shtab_ahriman_repo_remove_unknown_option_strings=('-h' '--help' '--dry-run')
|
||||||
@ -47,8 +47,8 @@ _shtab_ahriman_repo_sync_option_strings=('-h' '--help')
|
|||||||
_shtab_ahriman_sync_option_strings=('-h' '--help')
|
_shtab_ahriman_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' '--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_update_option_strings=('-h' '--help' '--aur' '--no-aur' '--changes' '--no-changes' '--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_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_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_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')
|
||||||
@ -243,6 +243,8 @@ _shtab_ahriman_repo_check__h_nargs=0
|
|||||||
_shtab_ahriman_repo_check___help_nargs=0
|
_shtab_ahriman_repo_check___help_nargs=0
|
||||||
_shtab_ahriman_repo_check___changes_nargs=0
|
_shtab_ahriman_repo_check___changes_nargs=0
|
||||||
_shtab_ahriman_repo_check___no_changes_nargs=0
|
_shtab_ahriman_repo_check___no_changes_nargs=0
|
||||||
|
_shtab_ahriman_repo_check___check_files_nargs=0
|
||||||
|
_shtab_ahriman_repo_check___no_check_files_nargs=0
|
||||||
_shtab_ahriman_repo_check__e_nargs=0
|
_shtab_ahriman_repo_check__e_nargs=0
|
||||||
_shtab_ahriman_repo_check___exit_code_nargs=0
|
_shtab_ahriman_repo_check___exit_code_nargs=0
|
||||||
_shtab_ahriman_repo_check___vcs_nargs=0
|
_shtab_ahriman_repo_check___vcs_nargs=0
|
||||||
@ -254,6 +256,8 @@ _shtab_ahriman_check__h_nargs=0
|
|||||||
_shtab_ahriman_check___help_nargs=0
|
_shtab_ahriman_check___help_nargs=0
|
||||||
_shtab_ahriman_check___changes_nargs=0
|
_shtab_ahriman_check___changes_nargs=0
|
||||||
_shtab_ahriman_check___no_changes_nargs=0
|
_shtab_ahriman_check___no_changes_nargs=0
|
||||||
|
_shtab_ahriman_check___check_files_nargs=0
|
||||||
|
_shtab_ahriman_check___no_check_files_nargs=0
|
||||||
_shtab_ahriman_check__e_nargs=0
|
_shtab_ahriman_check__e_nargs=0
|
||||||
_shtab_ahriman_check___exit_code_nargs=0
|
_shtab_ahriman_check___exit_code_nargs=0
|
||||||
_shtab_ahriman_check___vcs_nargs=0
|
_shtab_ahriman_check___vcs_nargs=0
|
||||||
@ -270,6 +274,8 @@ _shtab_ahriman_repo_daemon___aur_nargs=0
|
|||||||
_shtab_ahriman_repo_daemon___no_aur_nargs=0
|
_shtab_ahriman_repo_daemon___no_aur_nargs=0
|
||||||
_shtab_ahriman_repo_daemon___changes_nargs=0
|
_shtab_ahriman_repo_daemon___changes_nargs=0
|
||||||
_shtab_ahriman_repo_daemon___no_changes_nargs=0
|
_shtab_ahriman_repo_daemon___no_changes_nargs=0
|
||||||
|
_shtab_ahriman_repo_daemon___check_files_nargs=0
|
||||||
|
_shtab_ahriman_repo_daemon___no_check_files_nargs=0
|
||||||
_shtab_ahriman_repo_daemon___dependencies_nargs=0
|
_shtab_ahriman_repo_daemon___dependencies_nargs=0
|
||||||
_shtab_ahriman_repo_daemon___no_dependencies_nargs=0
|
_shtab_ahriman_repo_daemon___no_dependencies_nargs=0
|
||||||
_shtab_ahriman_repo_daemon___dry_run_nargs=0
|
_shtab_ahriman_repo_daemon___dry_run_nargs=0
|
||||||
@ -291,6 +297,8 @@ _shtab_ahriman_daemon___aur_nargs=0
|
|||||||
_shtab_ahriman_daemon___no_aur_nargs=0
|
_shtab_ahriman_daemon___no_aur_nargs=0
|
||||||
_shtab_ahriman_daemon___changes_nargs=0
|
_shtab_ahriman_daemon___changes_nargs=0
|
||||||
_shtab_ahriman_daemon___no_changes_nargs=0
|
_shtab_ahriman_daemon___no_changes_nargs=0
|
||||||
|
_shtab_ahriman_daemon___check_files_nargs=0
|
||||||
|
_shtab_ahriman_daemon___no_check_files_nargs=0
|
||||||
_shtab_ahriman_daemon___dependencies_nargs=0
|
_shtab_ahriman_daemon___dependencies_nargs=0
|
||||||
_shtab_ahriman_daemon___no_dependencies_nargs=0
|
_shtab_ahriman_daemon___no_dependencies_nargs=0
|
||||||
_shtab_ahriman_daemon___dry_run_nargs=0
|
_shtab_ahriman_daemon___dry_run_nargs=0
|
||||||
@ -358,6 +366,8 @@ _shtab_ahriman_repo_update___aur_nargs=0
|
|||||||
_shtab_ahriman_repo_update___no_aur_nargs=0
|
_shtab_ahriman_repo_update___no_aur_nargs=0
|
||||||
_shtab_ahriman_repo_update___changes_nargs=0
|
_shtab_ahriman_repo_update___changes_nargs=0
|
||||||
_shtab_ahriman_repo_update___no_changes_nargs=0
|
_shtab_ahriman_repo_update___no_changes_nargs=0
|
||||||
|
_shtab_ahriman_repo_update___check_files_nargs=0
|
||||||
|
_shtab_ahriman_repo_update___no_check_files_nargs=0
|
||||||
_shtab_ahriman_repo_update___dependencies_nargs=0
|
_shtab_ahriman_repo_update___dependencies_nargs=0
|
||||||
_shtab_ahriman_repo_update___no_dependencies_nargs=0
|
_shtab_ahriman_repo_update___no_dependencies_nargs=0
|
||||||
_shtab_ahriman_repo_update___dry_run_nargs=0
|
_shtab_ahriman_repo_update___dry_run_nargs=0
|
||||||
@ -380,6 +390,8 @@ _shtab_ahriman_update___aur_nargs=0
|
|||||||
_shtab_ahriman_update___no_aur_nargs=0
|
_shtab_ahriman_update___no_aur_nargs=0
|
||||||
_shtab_ahriman_update___changes_nargs=0
|
_shtab_ahriman_update___changes_nargs=0
|
||||||
_shtab_ahriman_update___no_changes_nargs=0
|
_shtab_ahriman_update___no_changes_nargs=0
|
||||||
|
_shtab_ahriman_update___check_files_nargs=0
|
||||||
|
_shtab_ahriman_update___no_check_files_nargs=0
|
||||||
_shtab_ahriman_update___dependencies_nargs=0
|
_shtab_ahriman_update___dependencies_nargs=0
|
||||||
_shtab_ahriman_update___no_dependencies_nargs=0
|
_shtab_ahriman_update___no_dependencies_nargs=0
|
||||||
_shtab_ahriman_update___dry_run_nargs=0
|
_shtab_ahriman_update___dry_run_nargs=0
|
||||||
@ -584,7 +596,7 @@ _set_new_action() {
|
|||||||
current_action_nargs=1
|
current_action_nargs=1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
current_action_args_start_index=$(( $word_index + 1 ))
|
current_action_args_start_index=$(( $word_index + 1 - $pos_only ))
|
||||||
|
|
||||||
current_action_is_positional=$2
|
current_action_is_positional=$2
|
||||||
}
|
}
|
||||||
@ -611,6 +623,7 @@ _shtab_ahriman() {
|
|||||||
|
|
||||||
local prefix=_shtab_ahriman
|
local prefix=_shtab_ahriman
|
||||||
local word_index=0
|
local word_index=0
|
||||||
|
local pos_only=0 # "--" delimeter not encountered yet
|
||||||
_set_parser_defaults
|
_set_parser_defaults
|
||||||
word_index=1
|
word_index=1
|
||||||
|
|
||||||
@ -619,26 +632,30 @@ _shtab_ahriman() {
|
|||||||
while [ $word_index -ne $COMP_CWORD ]; do
|
while [ $word_index -ne $COMP_CWORD ]; do
|
||||||
local this_word="${COMP_WORDS[$word_index]}"
|
local this_word="${COMP_WORDS[$word_index]}"
|
||||||
|
|
||||||
if [[ -n $sub_parsers && " ${sub_parsers[@]} " == *" ${this_word} "* ]]; then
|
if [[ $pos_only = 1 || " $this_word " != " -- " ]]; then
|
||||||
# valid subcommand: add it to the prefix & reset the current action
|
if [[ -n $sub_parsers && " ${sub_parsers[@]} " == *" ${this_word} "* ]]; then
|
||||||
prefix="${prefix}_$(_shtab_replace_nonword $this_word)"
|
# valid subcommand: add it to the prefix & reset the current action
|
||||||
_set_parser_defaults
|
prefix="${prefix}_$(_shtab_replace_nonword $this_word)"
|
||||||
fi
|
_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
|
# a new action should be acquired (due to recognised option string or
|
||||||
# no more input expected from current action);
|
# no more input expected from current action);
|
||||||
# the next positional action can fill in here
|
# the next positional action can fill in here
|
||||||
_set_new_action $this_word false
|
_set_new_action $this_word false
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [[ "$current_action_nargs" != "*" ]] && \
|
if [[ "$current_action_nargs" != "*" ]] && \
|
||||||
[[ "$current_action_nargs" != "+" ]] && \
|
[[ "$current_action_nargs" != "+" ]] && \
|
||||||
[[ "$current_action_nargs" != *"..." ]] && \
|
[[ "$current_action_nargs" != *"..." ]] && \
|
||||||
(( $word_index + 1 - $current_action_args_start_index >= \
|
(( $word_index + 1 - $current_action_args_start_index - $pos_only >= \
|
||||||
$current_action_nargs )); then
|
$current_action_nargs )); then
|
||||||
$current_action_is_positional && let "completed_positional_actions += 1"
|
$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
|
||||||
fi
|
fi
|
||||||
|
|
||||||
let "word_index+=1"
|
let "word_index+=1"
|
||||||
@ -646,7 +663,7 @@ _shtab_ahriman() {
|
|||||||
|
|
||||||
# Generate the completions
|
# Generate the completions
|
||||||
|
|
||||||
if [[ "${completing_word}" == -* ]]; then
|
if [[ $pos_only = 0 && "${completing_word}" == -* ]]; then
|
||||||
# optional argument started: use option strings
|
# optional argument started: use option strings
|
||||||
COMPREPLY=( $(compgen -W "${current_option_strings[*]}" -- "${completing_word}") )
|
COMPREPLY=( $(compgen -W "${current_option_strings[*]}" -- "${completing_word}") )
|
||||||
else
|
else
|
||||||
|
|||||||
@ -1,4 +1,4 @@
|
|||||||
.TH AHRIMAN "1" "2024\-01\-08" "ahriman" "Generated Python Manual"
|
.TH AHRIMAN "1" "2024\-05\-09" "ahriman" "Generated Python Manual"
|
||||||
.SH NAME
|
.SH NAME
|
||||||
ahriman
|
ahriman
|
||||||
.SH SYNOPSIS
|
.SH SYNOPSIS
|
||||||
@ -447,7 +447,9 @@ backup repository settings and database
|
|||||||
path of the output archive
|
path of the output archive
|
||||||
|
|
||||||
.SH COMMAND \fI\,'ahriman repo\-check'\/\fR
|
.SH COMMAND \fI\,'ahriman repo\-check'\/\fR
|
||||||
usage: ahriman repo\-check [\-h] [\-\-changes | \-\-no\-changes] [\-e] [\-\-vcs | \-\-no\-vcs] [\-y] [package ...]
|
usage: ahriman repo\-check [\-h] [\-\-changes | \-\-no\-changes] [\-\-check\-files | \-\-no\-check\-files] [\-e] [\-\-vcs | \-\-no\-vcs]
|
||||||
|
[\-y]
|
||||||
|
[package ...]
|
||||||
|
|
||||||
check for packages updates. Same as repo\-update \-\-dry\-run \-\-no\-manual
|
check for packages updates. Same as repo\-update \-\-dry\-run \-\-no\-manual
|
||||||
|
|
||||||
@ -460,6 +462,10 @@ filter check by package base
|
|||||||
\fB\-\-changes\fR, \fB\-\-no\-changes\fR
|
\fB\-\-changes\fR, \fB\-\-no\-changes\fR
|
||||||
calculate changes from the latest known commit if available. Only applicable in dry run mode
|
calculate changes from the latest known commit if available. Only applicable in dry run mode
|
||||||
|
|
||||||
|
.TP
|
||||||
|
\fB\-\-check\-files\fR, \fB\-\-no\-check\-files\fR
|
||||||
|
enable or disable checking of broken dependencies (e.g. dynamically linked libraries or modules directories)
|
||||||
|
|
||||||
.TP
|
.TP
|
||||||
\fB\-e\fR, \fB\-\-exit\-code\fR
|
\fB\-e\fR, \fB\-\-exit\-code\fR
|
||||||
return non\-zero exit status if result is empty
|
return non\-zero exit status if result is empty
|
||||||
@ -484,9 +490,9 @@ create package which contains list of available mirrors as set by configuration.
|
|||||||
|
|
||||||
.SH COMMAND \fI\,'ahriman repo\-daemon'\/\fR
|
.SH COMMAND \fI\,'ahriman repo\-daemon'\/\fR
|
||||||
usage: ahriman repo\-daemon [\-h] [\-i INTERVAL] [\-\-aur | \-\-no\-aur] [\-\-changes | \-\-no\-changes]
|
usage: ahriman repo\-daemon [\-h] [\-i INTERVAL] [\-\-aur | \-\-no\-aur] [\-\-changes | \-\-no\-changes]
|
||||||
[\-\-dependencies | \-\-no\-dependencies] [\-\-dry\-run] [\-\-increment | \-\-no\-increment]
|
[\-\-check\-files | \-\-no\-check\-files] [\-\-dependencies | \-\-no\-dependencies] [\-\-dry\-run]
|
||||||
[\-\-local | \-\-no\-local] [\-\-manual | \-\-no\-manual] [\-\-partitions | \-\-no\-partitions]
|
[\-\-increment | \-\-no\-increment] [\-\-local | \-\-no\-local] [\-\-manual | \-\-no\-manual]
|
||||||
[\-u USERNAME] [\-\-vcs | \-\-no\-vcs] [\-y]
|
[\-\-partitions | \-\-no\-partitions] [\-u USERNAME] [\-\-vcs | \-\-no\-vcs] [\-y]
|
||||||
|
|
||||||
start process which periodically will run update process
|
start process which periodically will run update process
|
||||||
|
|
||||||
@ -503,6 +509,10 @@ enable or disable checking for AUR updates
|
|||||||
\fB\-\-changes\fR, \fB\-\-no\-changes\fR
|
\fB\-\-changes\fR, \fB\-\-no\-changes\fR
|
||||||
calculate changes from the latest known commit if available. Only applicable in dry run mode
|
calculate changes from the latest known commit if available. Only applicable in dry run mode
|
||||||
|
|
||||||
|
.TP
|
||||||
|
\fB\-\-check\-files\fR, \fB\-\-no\-check\-files\fR
|
||||||
|
enable or disable checking of broken dependencies (e.g. dynamically linked libraries or modules directories)
|
||||||
|
|
||||||
.TP
|
.TP
|
||||||
\fB\-\-dependencies\fR, \fB\-\-no\-dependencies\fR
|
\fB\-\-dependencies\fR, \fB\-\-no\-dependencies\fR
|
||||||
process missing package dependencies
|
process missing package dependencies
|
||||||
@ -649,9 +659,9 @@ run triggers on empty build result as configured by settings
|
|||||||
instead of running all triggers as set by configuration, just process specified ones in order of mention
|
instead of running all triggers as set by configuration, just process specified ones in order of mention
|
||||||
|
|
||||||
.SH COMMAND \fI\,'ahriman repo\-update'\/\fR
|
.SH COMMAND \fI\,'ahriman repo\-update'\/\fR
|
||||||
usage: ahriman repo\-update [\-h] [\-\-aur | \-\-no\-aur] [\-\-changes | \-\-no\-changes] [\-\-dependencies | \-\-no\-dependencies]
|
usage: ahriman repo\-update [\-h] [\-\-aur | \-\-no\-aur] [\-\-changes | \-\-no\-changes] [\-\-check\-files | \-\-no\-check\-files]
|
||||||
[\-\-dry\-run] [\-e] [\-\-increment | \-\-no\-increment] [\-\-local | \-\-no\-local]
|
[\-\-dependencies | \-\-no\-dependencies] [\-\-dry\-run] [\-e] [\-\-increment | \-\-no\-increment]
|
||||||
[\-\-manual | \-\-no\-manual] [\-u USERNAME] [\-\-vcs | \-\-no\-vcs] [\-y]
|
[\-\-local | \-\-no\-local] [\-\-manual | \-\-no\-manual] [\-u USERNAME] [\-\-vcs | \-\-no\-vcs] [\-y]
|
||||||
[package ...]
|
[package ...]
|
||||||
|
|
||||||
check for packages updates and run build process if requested
|
check for packages updates and run build process if requested
|
||||||
@ -669,6 +679,10 @@ enable or disable checking for AUR updates
|
|||||||
\fB\-\-changes\fR, \fB\-\-no\-changes\fR
|
\fB\-\-changes\fR, \fB\-\-no\-changes\fR
|
||||||
calculate changes from the latest known commit if available. Only applicable in dry run mode
|
calculate changes from the latest known commit if available. Only applicable in dry run mode
|
||||||
|
|
||||||
|
.TP
|
||||||
|
\fB\-\-check\-files\fR, \fB\-\-no\-check\-files\fR
|
||||||
|
enable or disable checking of broken dependencies (e.g. dynamically linked libraries or modules directories)
|
||||||
|
|
||||||
.TP
|
.TP
|
||||||
\fB\-\-dependencies\fR, \fB\-\-no\-dependencies\fR
|
\fB\-\-dependencies\fR, \fB\-\-no\-dependencies\fR
|
||||||
process missing package dependencies
|
process missing package dependencies
|
||||||
|
|||||||
@ -120,6 +120,7 @@ _shtab_ahriman_aur_search_options=(
|
|||||||
_shtab_ahriman_check_options=(
|
_shtab_ahriman_check_options=(
|
||||||
"(- : *)"{-h,--help}"[show this help message and exit]"
|
"(- : *)"{-h,--help}"[show this help message and exit]"
|
||||||
{--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)]:changes:"
|
||||||
|
{--check-files,--no-check-files}"[enable or disable checking of broken dependencies (e.g. dynamically linked libraries or modules directories) (default\: True)]:check_files:"
|
||||||
{-e,--exit-code}"[return non-zero exit status if result is empty (default\: False)]"
|
{-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)]:vcs:"
|
||||||
"*"{-y,--refresh}"[download fresh package databases from the mirror before actions, -yy to force refresh even if up to date (default\: False)]"
|
"*"{-y,--refresh}"[download fresh package databases from the mirror before actions, -yy to force refresh even if up to date (default\: False)]"
|
||||||
@ -153,6 +154,7 @@ _shtab_ahriman_daemon_options=(
|
|||||||
{-i,--interval}"[interval between runs in seconds (default\: 43200)]:interval:"
|
{-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)]:aur:"
|
||||||
{--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)]:changes:"
|
||||||
|
{--check-files,--no-check-files}"[enable or disable checking of broken dependencies (e.g. dynamically linked libraries or modules directories) (default\: True)]:check_files:"
|
||||||
{--dependencies,--no-dependencies}"[process missing package dependencies (default\: True)]:dependencies:"
|
{--dependencies,--no-dependencies}"[process missing package dependencies (default\: True)]:dependencies:"
|
||||||
"--dry-run[just perform check for updates, same as check command (default\: False)]"
|
"--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)]:increment:"
|
||||||
@ -322,6 +324,7 @@ _shtab_ahriman_repo_backup_options=(
|
|||||||
_shtab_ahriman_repo_check_options=(
|
_shtab_ahriman_repo_check_options=(
|
||||||
"(- : *)"{-h,--help}"[show this help message and exit]"
|
"(- : *)"{-h,--help}"[show this help message and exit]"
|
||||||
{--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)]:changes:"
|
||||||
|
{--check-files,--no-check-files}"[enable or disable checking of broken dependencies (e.g. dynamically linked libraries or modules directories) (default\: True)]:check_files:"
|
||||||
{-e,--exit-code}"[return non-zero exit status if result is empty (default\: False)]"
|
{-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)]:vcs:"
|
||||||
"*"{-y,--refresh}"[download fresh package databases from the mirror before actions, -yy to force refresh even if up to date (default\: False)]"
|
"*"{-y,--refresh}"[download fresh package databases from the mirror before actions, -yy to force refresh even if up to date (default\: False)]"
|
||||||
@ -363,6 +366,7 @@ _shtab_ahriman_repo_daemon_options=(
|
|||||||
{-i,--interval}"[interval between runs in seconds (default\: 43200)]:interval:"
|
{-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)]:aur:"
|
||||||
{--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)]:changes:"
|
||||||
|
{--check-files,--no-check-files}"[enable or disable checking of broken dependencies (e.g. dynamically linked libraries or modules directories) (default\: True)]:check_files:"
|
||||||
{--dependencies,--no-dependencies}"[process missing package dependencies (default\: True)]:dependencies:"
|
{--dependencies,--no-dependencies}"[process missing package dependencies (default\: True)]:dependencies:"
|
||||||
"--dry-run[just perform check for updates, same as check command (default\: False)]"
|
"--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)]:increment:"
|
||||||
@ -460,6 +464,7 @@ _shtab_ahriman_repo_update_options=(
|
|||||||
"(- : *)"{-h,--help}"[show this help message and exit]"
|
"(- : *)"{-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)]:aur:"
|
||||||
{--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)]:changes:"
|
||||||
|
{--check-files,--no-check-files}"[enable or disable checking of broken dependencies (e.g. dynamically linked libraries or modules directories) (default\: True)]:check_files:"
|
||||||
{--dependencies,--no-dependencies}"[process missing package dependencies (default\: True)]:dependencies:"
|
{--dependencies,--no-dependencies}"[process missing package dependencies (default\: True)]:dependencies:"
|
||||||
"--dry-run[just perform check for updates, same as check command (default\: False)]"
|
"--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)]"
|
{-e,--exit-code}"[return non-zero exit status if result is empty (default\: False)]"
|
||||||
@ -601,6 +606,7 @@ _shtab_ahriman_update_options=(
|
|||||||
"(- : *)"{-h,--help}"[show this help message and exit]"
|
"(- : *)"{-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)]:aur:"
|
||||||
{--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)]:changes:"
|
||||||
|
{--check-files,--no-check-files}"[enable or disable checking of broken dependencies (e.g. dynamically linked libraries or modules directories) (default\: True)]:check_files:"
|
||||||
{--dependencies,--no-dependencies}"[process missing package dependencies (default\: True)]:dependencies:"
|
{--dependencies,--no-dependencies}"[process missing package dependencies (default\: True)]:dependencies:"
|
||||||
"--dry-run[just perform check for updates, same as check command (default\: False)]"
|
"--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)]"
|
{-e,--exit-code}"[return non-zero exit status if result is empty (default\: False)]"
|
||||||
@ -736,4 +742,12 @@ _shtab_ahriman() {
|
|||||||
|
|
||||||
|
|
||||||
typeset -A opt_args
|
typeset -A opt_args
|
||||||
_shtab_ahriman "$@"
|
|
||||||
|
if [[ $zsh_eval_context[-1] == eval ]]; then
|
||||||
|
# eval/source/. command, register function for later
|
||||||
|
compdef _shtab_ahriman -N ahriman
|
||||||
|
else
|
||||||
|
# autoload from fpath, call function directly
|
||||||
|
_shtab_ahriman "$@"
|
||||||
|
fi
|
||||||
|
|
||||||
|
|||||||
@ -20,6 +20,7 @@ dependencies = [
|
|||||||
"cerberus",
|
"cerberus",
|
||||||
"inflection",
|
"inflection",
|
||||||
"passlib",
|
"passlib",
|
||||||
|
"pyelftools",
|
||||||
"requests",
|
"requests",
|
||||||
"srcinfo",
|
"srcinfo",
|
||||||
]
|
]
|
||||||
@ -81,6 +82,7 @@ web = [
|
|||||||
"aiohttp_security",
|
"aiohttp_security",
|
||||||
"cryptography",
|
"cryptography",
|
||||||
"requests-unixsocket", # required by unix socket support
|
"requests-unixsocket", # required by unix socket support
|
||||||
|
"setuptools", # required by aiohttp-apispec
|
||||||
]
|
]
|
||||||
|
|
||||||
[tool.flit.sdist]
|
[tool.flit.sdist]
|
||||||
|
|||||||
@ -17,4 +17,4 @@
|
|||||||
# You should have received a copy of the GNU General Public License
|
# You should have received a copy of the GNU General Public License
|
||||||
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
#
|
#
|
||||||
__version__ = "2.13.1"
|
__version__ = "2.13.7"
|
||||||
|
|||||||
@ -537,6 +537,9 @@ def _set_repo_check_parser(root: SubParserAction) -> argparse.ArgumentParser:
|
|||||||
parser.add_argument("--changes", help="calculate changes from the latest known commit if available. "
|
parser.add_argument("--changes", help="calculate changes from the latest known commit if available. "
|
||||||
"Only applicable in dry run mode",
|
"Only applicable in dry run mode",
|
||||||
action=argparse.BooleanOptionalAction, default=True)
|
action=argparse.BooleanOptionalAction, default=True)
|
||||||
|
parser.add_argument("--check-files", help="enable or disable checking of broken dependencies "
|
||||||
|
"(e.g. dynamically linked libraries or modules directories)",
|
||||||
|
action=argparse.BooleanOptionalAction, default=True)
|
||||||
parser.add_argument("-e", "--exit-code", help="return non-zero exit status if result is empty", action="store_true")
|
parser.add_argument("-e", "--exit-code", help="return non-zero exit status if result is empty", action="store_true")
|
||||||
parser.add_argument("--vcs", help="fetch actual version of VCS packages",
|
parser.add_argument("--vcs", help="fetch actual version of VCS packages",
|
||||||
action=argparse.BooleanOptionalAction, default=True)
|
action=argparse.BooleanOptionalAction, default=True)
|
||||||
@ -605,6 +608,9 @@ def _set_repo_daemon_parser(root: SubParserAction) -> argparse.ArgumentParser:
|
|||||||
parser.add_argument("--changes", help="calculate changes from the latest known commit if available. "
|
parser.add_argument("--changes", help="calculate changes from the latest known commit if available. "
|
||||||
"Only applicable in dry run mode",
|
"Only applicable in dry run mode",
|
||||||
action=argparse.BooleanOptionalAction, default=True)
|
action=argparse.BooleanOptionalAction, default=True)
|
||||||
|
parser.add_argument("--check-files", help="enable or disable checking of broken dependencies "
|
||||||
|
"(e.g. dynamically linked libraries or modules directories)",
|
||||||
|
action=argparse.BooleanOptionalAction, default=True)
|
||||||
parser.add_argument("--dependencies", help="process missing package dependencies",
|
parser.add_argument("--dependencies", help="process missing package dependencies",
|
||||||
action=argparse.BooleanOptionalAction, default=True)
|
action=argparse.BooleanOptionalAction, default=True)
|
||||||
parser.add_argument("--dry-run", help="just perform check for updates, same as check command", action="store_true")
|
parser.add_argument("--dry-run", help="just perform check for updates, same as check command", action="store_true")
|
||||||
@ -826,6 +832,9 @@ def _set_repo_update_parser(root: SubParserAction) -> argparse.ArgumentParser:
|
|||||||
parser.add_argument("--changes", help="calculate changes from the latest known commit if available. "
|
parser.add_argument("--changes", help="calculate changes from the latest known commit if available. "
|
||||||
"Only applicable in dry run mode",
|
"Only applicable in dry run mode",
|
||||||
action=argparse.BooleanOptionalAction, default=True)
|
action=argparse.BooleanOptionalAction, default=True)
|
||||||
|
parser.add_argument("--check-files", help="enable or disable checking of broken dependencies "
|
||||||
|
"(e.g. dynamically linked libraries or modules directories)",
|
||||||
|
action=argparse.BooleanOptionalAction, default=True)
|
||||||
parser.add_argument("--dependencies", help="process missing package dependencies",
|
parser.add_argument("--dependencies", help="process missing package dependencies",
|
||||||
action=argparse.BooleanOptionalAction, default=True)
|
action=argparse.BooleanOptionalAction, default=True)
|
||||||
parser.add_argument("--dry-run", help="just perform check for updates, same as check command", action="store_true")
|
parser.add_argument("--dry-run", help="just perform check for updates, same as check command", action="store_true")
|
||||||
|
|||||||
@ -62,10 +62,13 @@ class Application(ApplicationPackages, ApplicationRepository):
|
|||||||
"""
|
"""
|
||||||
known_packages: set[str] = set()
|
known_packages: set[str] = set()
|
||||||
# local set
|
# local set
|
||||||
|
# this action is not really needed in case if ``alpm.use_ahriman_cache`` set to yes, because pacman
|
||||||
|
# will eventually contain all the local packages
|
||||||
for base in self.repository.packages():
|
for base in self.repository.packages():
|
||||||
for package, properties in base.packages.items():
|
for package, properties in base.packages.items():
|
||||||
known_packages.add(package)
|
known_packages.add(package)
|
||||||
known_packages.update(properties.provides)
|
known_packages.update(properties.provides)
|
||||||
|
# known pacman databases
|
||||||
known_packages.update(self.repository.pacman.packages())
|
known_packages.update(self.repository.pacman.packages())
|
||||||
return known_packages
|
return known_packages
|
||||||
|
|
||||||
|
|||||||
@ -91,10 +91,7 @@ class ApplicationRepository(ApplicationProperties):
|
|||||||
packages(Iterable[str]): only sign specified packages
|
packages(Iterable[str]): only sign specified packages
|
||||||
"""
|
"""
|
||||||
# copy to prebuilt directory
|
# copy to prebuilt directory
|
||||||
for package in self.repository.packages():
|
for package in self.repository.packages(packages):
|
||||||
# no one requested this package
|
|
||||||
if packages and package.base not in packages:
|
|
||||||
continue
|
|
||||||
for archive in package.packages.values():
|
for archive in package.packages.values():
|
||||||
if archive.filepath is None:
|
if archive.filepath is None:
|
||||||
self.logger.warning("filepath is empty for %s", package.base)
|
self.logger.warning("filepath is empty for %s", package.base)
|
||||||
@ -163,8 +160,8 @@ class ApplicationRepository(ApplicationProperties):
|
|||||||
built_packages = self.repository.packages_built()
|
built_packages = self.repository.packages_built()
|
||||||
if built_packages: # speedup a bit
|
if built_packages: # speedup a bit
|
||||||
build_result = self.repository.process_update(built_packages, packagers)
|
build_result = self.repository.process_update(built_packages, packagers)
|
||||||
|
self.on_result(build_result)
|
||||||
result.merge(build_result)
|
result.merge(build_result)
|
||||||
self.on_result(result.merge(build_result))
|
|
||||||
|
|
||||||
builder = Updater.load(self.repository_id, self.configuration, self.repository)
|
builder = Updater.load(self.repository_id, self.configuration, self.repository)
|
||||||
|
|
||||||
@ -173,12 +170,13 @@ class ApplicationRepository(ApplicationProperties):
|
|||||||
for num, partition in enumerate(partitions):
|
for num, partition in enumerate(partitions):
|
||||||
self.logger.info("processing chunk #%i %s", num, [package.base for package in partition])
|
self.logger.info("processing chunk #%i %s", num, [package.base for package in partition])
|
||||||
build_result = builder.update(partition, packagers, bump_pkgrel=bump_pkgrel)
|
build_result = builder.update(partition, packagers, bump_pkgrel=bump_pkgrel)
|
||||||
self.on_result(result.merge(build_result))
|
self.on_result(build_result)
|
||||||
|
result.merge(build_result)
|
||||||
|
|
||||||
return result
|
return result
|
||||||
|
|
||||||
def updates(self, filter_packages: Iterable[str], *,
|
def updates(self, filter_packages: Iterable[str], *,
|
||||||
aur: bool, local: bool, manual: bool, vcs: bool) -> list[Package]:
|
aur: bool, local: bool, manual: bool, vcs: bool, check_files: bool) -> list[Package]:
|
||||||
"""
|
"""
|
||||||
get list of packages to run update process
|
get list of packages to run update process
|
||||||
|
|
||||||
@ -188,6 +186,7 @@ class ApplicationRepository(ApplicationProperties):
|
|||||||
local(bool): enable or disable checking of local packages for updates
|
local(bool): enable or disable checking of local packages for updates
|
||||||
manual(bool): include or exclude manual updates
|
manual(bool): include or exclude manual updates
|
||||||
vcs(bool): enable or disable checking of VCS packages
|
vcs(bool): enable or disable checking of VCS packages
|
||||||
|
check_files(bool): check for broken dependencies
|
||||||
|
|
||||||
Returns:
|
Returns:
|
||||||
list[Package]: list of out-of-dated packages
|
list[Package]: list of out-of-dated packages
|
||||||
@ -200,5 +199,7 @@ class ApplicationRepository(ApplicationProperties):
|
|||||||
updates.update({package.base: package for package in self.repository.updates_local(vcs=vcs)})
|
updates.update({package.base: package for package in self.repository.updates_local(vcs=vcs)})
|
||||||
if manual:
|
if manual:
|
||||||
updates.update({package.base: package for package in self.repository.updates_manual()})
|
updates.update({package.base: package for package in self.repository.updates_manual()})
|
||||||
|
if check_files:
|
||||||
|
updates.update({package.base: package for package in self.repository.updates_dependencies(filter_packages)})
|
||||||
|
|
||||||
return [package for _, package in sorted(updates.items())]
|
return [package for _, package in sorted(updates.items())]
|
||||||
|
|||||||
@ -55,7 +55,7 @@ class Add(Handler):
|
|||||||
if not args.now:
|
if not args.now:
|
||||||
return
|
return
|
||||||
|
|
||||||
packages = application.updates(args.package, aur=False, local=False, manual=True, vcs=False)
|
packages = application.updates(args.package, aur=False, local=False, manual=True, vcs=False, check_files=False)
|
||||||
packages = application.with_dependencies(packages, process_dependencies=args.dependencies)
|
packages = application.with_dependencies(packages, process_dependencies=args.dependencies)
|
||||||
packagers = Packagers(args.username, {package.base: package.packager for package in packages})
|
packagers = Packagers(args.username, {package.base: package.packager for package in packages})
|
||||||
|
|
||||||
|
|||||||
@ -18,10 +18,10 @@
|
|||||||
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
#
|
#
|
||||||
import argparse
|
import argparse
|
||||||
import pwd
|
import tarfile
|
||||||
|
|
||||||
from pathlib import Path
|
from pathlib import Path
|
||||||
from tarfile import TarFile
|
from pwd import getpwuid
|
||||||
|
|
||||||
from ahriman.application.handlers.handler import Handler
|
from ahriman.application.handlers.handler import Handler
|
||||||
from ahriman.core.configuration import Configuration
|
from ahriman.core.configuration import Configuration
|
||||||
@ -49,7 +49,7 @@ class Backup(Handler):
|
|||||||
report(bool): force enable or disable reporting
|
report(bool): force enable or disable reporting
|
||||||
"""
|
"""
|
||||||
backup_paths = Backup.get_paths(configuration)
|
backup_paths = Backup.get_paths(configuration)
|
||||||
with TarFile(args.path, mode="w") as archive: # well we don't actually use compression
|
with tarfile.open(args.path, mode="w") as archive: # well we don't actually use compression
|
||||||
for backup_path in backup_paths:
|
for backup_path in backup_paths:
|
||||||
archive.add(backup_path)
|
archive.add(backup_path)
|
||||||
|
|
||||||
@ -77,7 +77,7 @@ class Backup(Handler):
|
|||||||
|
|
||||||
# gnupg home with imported keys
|
# gnupg home with imported keys
|
||||||
uid, _ = repository_paths.root_owner
|
uid, _ = repository_paths.root_owner
|
||||||
system_user = pwd.getpwuid(uid)
|
system_user = getpwuid(uid)
|
||||||
gnupg_home = Path(system_user.pw_dir) / ".gnupg"
|
gnupg_home = Path(system_user.pw_dir) / ".gnupg"
|
||||||
if gnupg_home.is_dir():
|
if gnupg_home.is_dir():
|
||||||
paths.add(gnupg_home)
|
paths.add(gnupg_home)
|
||||||
|
|||||||
@ -102,8 +102,9 @@ class Patch(Handler):
|
|||||||
patch = "".join(list(sys.stdin))
|
patch = "".join(list(sys.stdin))
|
||||||
else:
|
else:
|
||||||
patch = patch_path.read_text(encoding="utf8")
|
patch = patch_path.read_text(encoding="utf8")
|
||||||
patch = patch.strip() # remove spaces around the patch
|
# remove spaces around the patch and parse to correct type
|
||||||
return PkgbuildPatch(variable, patch)
|
parsed = PkgbuildPatch.parse(patch.strip())
|
||||||
|
return PkgbuildPatch(variable, parsed)
|
||||||
|
|
||||||
@staticmethod
|
@staticmethod
|
||||||
def patch_set_create(application: Application, package_base: str, patch: PkgbuildPatch) -> None:
|
def patch_set_create(application: Application, package_base: str, patch: PkgbuildPatch) -> None:
|
||||||
|
|||||||
@ -18,8 +18,7 @@
|
|||||||
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
#
|
#
|
||||||
import argparse
|
import argparse
|
||||||
|
import tarfile
|
||||||
from tarfile import TarFile
|
|
||||||
|
|
||||||
from ahriman.application.handlers.handler import Handler
|
from ahriman.application.handlers.handler import Handler
|
||||||
from ahriman.core.configuration import Configuration
|
from ahriman.core.configuration import Configuration
|
||||||
@ -45,5 +44,5 @@ class Restore(Handler):
|
|||||||
configuration(Configuration): configuration instance
|
configuration(Configuration): configuration instance
|
||||||
report(bool): force enable or disable reporting
|
report(bool): force enable or disable reporting
|
||||||
"""
|
"""
|
||||||
with TarFile(args.path) as archive:
|
with tarfile.open(args.path) as archive:
|
||||||
archive.extractall(path=args.output)
|
archive.extractall(path=args.output) # nosec
|
||||||
|
|||||||
@ -48,7 +48,8 @@ class Update(Handler):
|
|||||||
application = Application(repository_id, configuration, report=report, refresh_pacman_database=args.refresh)
|
application = Application(repository_id, configuration, report=report, refresh_pacman_database=args.refresh)
|
||||||
application.on_start()
|
application.on_start()
|
||||||
|
|
||||||
packages = application.updates(args.package, aur=args.aur, local=args.local, manual=args.manual, vcs=args.vcs)
|
packages = application.updates(args.package, aur=args.aur, local=args.local, manual=args.manual, vcs=args.vcs,
|
||||||
|
check_files=args.check_files)
|
||||||
if args.dry_run: # some check specific actions
|
if args.dry_run: # some check specific actions
|
||||||
if args.changes: # generate changes if requested
|
if args.changes: # generate changes if requested
|
||||||
application.changes(packages)
|
application.changes(packages)
|
||||||
|
|||||||
@ -38,12 +38,12 @@ class _Context:
|
|||||||
"""
|
"""
|
||||||
self._content: dict[str, Any] = {}
|
self._content: dict[str, Any] = {}
|
||||||
|
|
||||||
def get(self, key: ContextKey[T]) -> T:
|
def get(self, key: ContextKey[T] | type[T]) -> T:
|
||||||
"""
|
"""
|
||||||
get value for the specified key
|
get value for the specified key
|
||||||
|
|
||||||
Args:
|
Args:
|
||||||
key(ContextKey[T]): context key name
|
key(ContextKey[T] | type[T]): context key name
|
||||||
|
|
||||||
Returns:
|
Returns:
|
||||||
T: value associated with the key
|
T: value associated with the key
|
||||||
@ -52,29 +52,37 @@ class _Context:
|
|||||||
KeyError: in case if the specified context variable was not found
|
KeyError: in case if the specified context variable was not found
|
||||||
ValueError: in case if type of value is not an instance of specified return type
|
ValueError: in case if type of value is not an instance of specified return type
|
||||||
"""
|
"""
|
||||||
|
if not isinstance(key, ContextKey):
|
||||||
|
key = ContextKey.from_type(key)
|
||||||
|
|
||||||
if key.key not in self._content:
|
if key.key not in self._content:
|
||||||
raise KeyError(key.key)
|
raise KeyError(key.key)
|
||||||
value = self._content[key.key]
|
value = self._content[key.key]
|
||||||
if not isinstance(value, key.return_type):
|
if not isinstance(value, key.return_type):
|
||||||
raise ValueError(f"Value {value} is not an instance of {key.return_type}")
|
raise ValueError(f"Value {value} is not an instance of {key.return_type}")
|
||||||
|
|
||||||
return value
|
return value
|
||||||
|
|
||||||
def set(self, key: ContextKey[T], value: T) -> None:
|
def set(self, key: ContextKey[T] | type[T], value: T) -> None:
|
||||||
"""
|
"""
|
||||||
set value for the specified key
|
set value for the specified key
|
||||||
|
|
||||||
Args:
|
Args:
|
||||||
key(ContextKey[T]): context key name
|
key(ContextKey[T] | type[T]): context key name
|
||||||
value(T): context value associated with the specified key
|
value(T): context value associated with the specified key
|
||||||
|
|
||||||
Raises:
|
Raises:
|
||||||
KeyError: in case if the specified context variable already exists
|
KeyError: in case if the specified context variable already exists
|
||||||
ValueError: in case if type of value is not an instance of specified return type
|
ValueError: in case if type of value is not an instance of specified return type
|
||||||
"""
|
"""
|
||||||
|
if not isinstance(key, ContextKey):
|
||||||
|
key = ContextKey.from_type(key)
|
||||||
|
|
||||||
if key.key in self._content:
|
if key.key in self._content:
|
||||||
raise KeyError(key.key)
|
raise KeyError(key.key)
|
||||||
if not isinstance(value, key.return_type):
|
if not isinstance(value, key.return_type):
|
||||||
raise ValueError(f"Value {value} is not an instance of {key.return_type}")
|
raise ValueError(f"Value {value} is not an instance of {key.return_type}")
|
||||||
|
|
||||||
self._content[key.key] = value
|
self._content[key.key] = value
|
||||||
|
|
||||||
def __iter__(self) -> Iterator[str]:
|
def __iter__(self) -> Iterator[str]:
|
||||||
|
|||||||
@ -18,24 +18,31 @@
|
|||||||
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
#
|
#
|
||||||
import shutil
|
import shutil
|
||||||
|
import tarfile
|
||||||
|
|
||||||
from collections.abc import Callable, Generator
|
from collections.abc import Generator, Iterable
|
||||||
from functools import cached_property
|
from functools import cached_property
|
||||||
from pathlib import Path
|
from pathlib import Path
|
||||||
from pyalpm import DB, Handle, Package, SIG_PACKAGE, error as PyalpmError # type: ignore[import-not-found]
|
from pyalpm import DB, Handle, Package, SIG_DATABASE_OPTIONAL, SIG_PACKAGE_OPTIONAL # type: ignore[import-not-found]
|
||||||
from string import Template
|
from string import Template
|
||||||
|
|
||||||
|
from ahriman.core.alpm.pacman_database import PacmanDatabase
|
||||||
from ahriman.core.configuration import Configuration
|
from ahriman.core.configuration import Configuration
|
||||||
from ahriman.core.log import LazyLogging
|
from ahriman.core.log import LazyLogging
|
||||||
from ahriman.core.util import trim_package
|
from ahriman.core.util import trim_package
|
||||||
from ahriman.models.pacman_synchronization import PacmanSynchronization
|
from ahriman.models.pacman_synchronization import PacmanSynchronization
|
||||||
from ahriman.models.repository_id import RepositoryId
|
from ahriman.models.repository_id import RepositoryId
|
||||||
from ahriman.models.repository_paths import RepositoryPaths
|
|
||||||
|
|
||||||
|
|
||||||
class Pacman(LazyLogging):
|
class Pacman(LazyLogging):
|
||||||
"""
|
"""
|
||||||
alpm wrapper
|
alpm wrapper
|
||||||
|
|
||||||
|
Attributes:
|
||||||
|
configuration(Configuration): configuration instance
|
||||||
|
refresh_database(PacmanSynchronization): synchronize local cache to remote
|
||||||
|
repository_id(RepositoryId): repository unique identifier
|
||||||
|
repository_path(RepositoryPaths): repository paths instance
|
||||||
"""
|
"""
|
||||||
|
|
||||||
def __init__(self, repository_id: RepositoryId, configuration: Configuration, *,
|
def __init__(self, repository_id: RepositoryId, configuration: Configuration, *,
|
||||||
@ -48,8 +55,11 @@ class Pacman(LazyLogging):
|
|||||||
configuration(Configuration): configuration instance
|
configuration(Configuration): configuration instance
|
||||||
refresh_database(PacmanSynchronization): synchronize local cache to remote
|
refresh_database(PacmanSynchronization): synchronize local cache to remote
|
||||||
"""
|
"""
|
||||||
self.__create_handle_fn: Callable[[], Handle] = lambda: self.__create_handle(
|
self.configuration = configuration
|
||||||
repository_id, configuration, refresh_database=refresh_database)
|
self.repository_id = repository_id
|
||||||
|
self.repository_paths = configuration.repository_paths
|
||||||
|
|
||||||
|
self.refresh_database = refresh_database
|
||||||
|
|
||||||
@cached_property
|
@cached_property
|
||||||
def handle(self) -> Handle:
|
def handle(self) -> Handle:
|
||||||
@ -59,40 +69,39 @@ class Pacman(LazyLogging):
|
|||||||
Returns:
|
Returns:
|
||||||
Handle: generated pyalpm handle instance
|
Handle: generated pyalpm handle instance
|
||||||
"""
|
"""
|
||||||
return self.__create_handle_fn()
|
return self.__create_handle(refresh_database=self.refresh_database)
|
||||||
|
|
||||||
def __create_handle(self, repository_id: RepositoryId, configuration: Configuration, *,
|
def __create_handle(self, *, refresh_database: PacmanSynchronization) -> Handle:
|
||||||
refresh_database: PacmanSynchronization) -> Handle:
|
|
||||||
"""
|
"""
|
||||||
create lazy handle function
|
create lazy handle function
|
||||||
|
|
||||||
Args:
|
Args:
|
||||||
repository_id(RepositoryId): repository unique identifier
|
|
||||||
configuration(Configuration): configuration instance
|
|
||||||
refresh_database(PacmanSynchronization): synchronize local cache to remote
|
refresh_database(PacmanSynchronization): synchronize local cache to remote
|
||||||
|
|
||||||
Returns:
|
Returns:
|
||||||
Handle: fully initialized pacman handle
|
Handle: fully initialized pacman handle
|
||||||
"""
|
"""
|
||||||
root = configuration.getpath("alpm", "root")
|
pacman_root = self.configuration.getpath("alpm", "database")
|
||||||
pacman_root = configuration.getpath("alpm", "database")
|
use_ahriman_cache = self.configuration.getboolean("alpm", "use_ahriman_cache")
|
||||||
use_ahriman_cache = configuration.getboolean("alpm", "use_ahriman_cache")
|
|
||||||
mirror = configuration.get("alpm", "mirror")
|
|
||||||
paths = configuration.repository_paths
|
|
||||||
database_path = paths.pacman if use_ahriman_cache else pacman_root
|
|
||||||
|
|
||||||
|
database_path = self.repository_paths.pacman if use_ahriman_cache else pacman_root
|
||||||
|
root = self.configuration.getpath("alpm", "root")
|
||||||
handle = Handle(str(root), str(database_path))
|
handle = Handle(str(root), str(database_path))
|
||||||
for repository in configuration.getlist("alpm", "repositories"):
|
|
||||||
database = self.database_init(handle, repository, mirror, repository_id.architecture)
|
for repository in self.configuration.getlist("alpm", "repositories"):
|
||||||
self.database_copy(handle, database, pacman_root, paths, use_ahriman_cache=use_ahriman_cache)
|
database = self.database_init(handle, repository, self.repository_id.architecture)
|
||||||
|
self.database_copy(handle, database, pacman_root, use_ahriman_cache=use_ahriman_cache)
|
||||||
|
|
||||||
|
# install repository database too
|
||||||
|
local_database = self.database_init(handle, self.repository_id.name, self.repository_id.architecture)
|
||||||
|
self.database_copy(handle, local_database, pacman_root, use_ahriman_cache=use_ahriman_cache)
|
||||||
|
|
||||||
if use_ahriman_cache and refresh_database:
|
if use_ahriman_cache and refresh_database:
|
||||||
self.database_sync(handle, force=refresh_database == PacmanSynchronization.Force)
|
self.database_sync(handle, force=refresh_database == PacmanSynchronization.Force)
|
||||||
|
|
||||||
return handle
|
return handle
|
||||||
|
|
||||||
def database_copy(self, handle: Handle, database: DB, pacman_root: Path, paths: RepositoryPaths, *,
|
def database_copy(self, handle: Handle, database: DB, pacman_root: Path, *, use_ahriman_cache: bool) -> None:
|
||||||
use_ahriman_cache: bool) -> None:
|
|
||||||
"""
|
"""
|
||||||
copy database from the operating system root to the ahriman local home
|
copy database from the operating system root to the ahriman local home
|
||||||
|
|
||||||
@ -100,7 +109,6 @@ class Pacman(LazyLogging):
|
|||||||
handle(Handle): pacman handle which will be used for database copying
|
handle(Handle): pacman handle which will be used for database copying
|
||||||
database(DB): pacman database instance to be copied
|
database(DB): pacman database instance to be copied
|
||||||
pacman_root(Path): operating system pacman root
|
pacman_root(Path): operating system pacman root
|
||||||
paths(RepositoryPaths): repository paths instance
|
|
||||||
use_ahriman_cache(bool): use local ahriman cache instead of system one
|
use_ahriman_cache(bool): use local ahriman cache instead of system one
|
||||||
"""
|
"""
|
||||||
def repository_database(root: Path) -> Path:
|
def repository_database(root: Path) -> Path:
|
||||||
@ -122,30 +130,36 @@ class Pacman(LazyLogging):
|
|||||||
return # database for some reason deos not exist
|
return # database for some reason deos not exist
|
||||||
self.logger.info("copy pacman database from operating system root to ahriman's home")
|
self.logger.info("copy pacman database from operating system root to ahriman's home")
|
||||||
shutil.copy(src, dst)
|
shutil.copy(src, dst)
|
||||||
paths.chown(dst)
|
self.repository_paths.chown(dst)
|
||||||
|
|
||||||
def database_init(self, handle: Handle, repository: str, mirror: str, architecture: str) -> DB:
|
def database_init(self, handle: Handle, repository: str, architecture: str) -> DB:
|
||||||
"""
|
"""
|
||||||
create database instance from pacman handler and set its properties
|
create database instance from pacman handler and set its properties
|
||||||
|
|
||||||
Args:
|
Args:
|
||||||
handle(Handle): pacman handle which will be used for database initializing
|
handle(Handle): pacman handle which will be used for database initializing
|
||||||
repository(str): pacman repository name (e.g. core)
|
repository(str): pacman repository name (e.g. core)
|
||||||
mirror(str): arch linux mirror url
|
|
||||||
architecture(str): repository architecture
|
architecture(str): repository architecture
|
||||||
|
|
||||||
Returns:
|
Returns:
|
||||||
DB: loaded pacman database instance
|
DB: loaded pacman database instance
|
||||||
"""
|
"""
|
||||||
self.logger.info("loading pacman database %s", repository)
|
self.logger.info("loading pacman database %s", repository)
|
||||||
database: DB = handle.register_syncdb(repository, SIG_PACKAGE)
|
database: DB = handle.register_syncdb(repository, SIG_DATABASE_OPTIONAL | SIG_PACKAGE_OPTIONAL)
|
||||||
|
|
||||||
# replace variables in mirror address
|
if repository != self.repository_id.name:
|
||||||
variables = {
|
mirror = self.configuration.get("alpm", "mirror")
|
||||||
"arch": architecture,
|
# replace variables in mirror address
|
||||||
"repo": repository,
|
variables = {
|
||||||
}
|
"arch": architecture,
|
||||||
database.servers = [Template(mirror).safe_substitute(variables)]
|
"repo": repository,
|
||||||
|
}
|
||||||
|
server = Template(mirror).safe_substitute(variables)
|
||||||
|
else:
|
||||||
|
# special case, same database, use local storage instead
|
||||||
|
server = f"file://{self.repository_paths.repository}"
|
||||||
|
|
||||||
|
database.servers = [server]
|
||||||
|
|
||||||
return database
|
return database
|
||||||
|
|
||||||
@ -160,13 +174,44 @@ class Pacman(LazyLogging):
|
|||||||
self.logger.info("refresh ahriman's home pacman database (force refresh %s)", force)
|
self.logger.info("refresh ahriman's home pacman database (force refresh %s)", force)
|
||||||
transaction = handle.init_transaction()
|
transaction = handle.init_transaction()
|
||||||
for database in handle.get_syncdbs():
|
for database in handle.get_syncdbs():
|
||||||
try:
|
PacmanDatabase(database, self.configuration).sync(force=force)
|
||||||
database.update(force)
|
|
||||||
except PyalpmError:
|
|
||||||
self.logger.exception("exception during update %s", database.name)
|
|
||||||
transaction.release()
|
transaction.release()
|
||||||
|
|
||||||
def package_get(self, package_name: str) -> Generator[Package, None, None]:
|
def files(self, packages: Iterable[str] | None = None) -> dict[str, set[Path]]:
|
||||||
|
"""
|
||||||
|
extract list of known packages from the databases
|
||||||
|
|
||||||
|
Args:
|
||||||
|
packages(Iterable[str] | None, optional): filter by package names (Default value = None)
|
||||||
|
|
||||||
|
Returns:
|
||||||
|
dict[str, set[Path]]: map of package name to its list of files
|
||||||
|
"""
|
||||||
|
packages = packages or []
|
||||||
|
|
||||||
|
def extract(tar: tarfile.TarFile) -> Generator[tuple[str, set[Path]], None, None]:
|
||||||
|
for descriptor in filter(lambda info: info.path.endswith("/files"), tar.getmembers()):
|
||||||
|
package, *_ = str(Path(descriptor.path).parent).rsplit("-", 2)
|
||||||
|
if packages and package not in packages:
|
||||||
|
continue # skip unused packages
|
||||||
|
content = tar.extractfile(descriptor)
|
||||||
|
if content is None:
|
||||||
|
continue
|
||||||
|
files = {Path(filename.decode("utf8").rstrip()) for filename in content.readlines()}
|
||||||
|
|
||||||
|
yield package, files
|
||||||
|
|
||||||
|
result: dict[str, set[Path]] = {}
|
||||||
|
for database in self.handle.get_syncdbs():
|
||||||
|
database_file = self.repository_paths.pacman / "sync" / f"{database.name}.files.tar.gz"
|
||||||
|
if not database_file.is_file():
|
||||||
|
continue # no database file found
|
||||||
|
with tarfile.open(database_file, "r:gz") as archive:
|
||||||
|
result.update(extract(archive))
|
||||||
|
|
||||||
|
return result
|
||||||
|
|
||||||
|
def package(self, package_name: str) -> Generator[Package, None, None]:
|
||||||
"""
|
"""
|
||||||
retrieve list of the packages from the repository by name
|
retrieve list of the packages from the repository by name
|
||||||
|
|
||||||
|
|||||||
170
src/ahriman/core/alpm/pacman_database.py
Normal file
170
src/ahriman/core/alpm/pacman_database.py
Normal file
@ -0,0 +1,170 @@
|
|||||||
|
#
|
||||||
|
# Copyright (c) 2021-2024 ahriman team.
|
||||||
|
#
|
||||||
|
# This file is part of ahriman
|
||||||
|
# (see https://github.com/arcan1s/ahriman).
|
||||||
|
#
|
||||||
|
# This program is free software: you can redistribute it and/or modify
|
||||||
|
# it under the terms of the GNU General Public License as published by
|
||||||
|
# the Free Software Foundation, either version 3 of the License, or
|
||||||
|
# (at your option) any later version.
|
||||||
|
#
|
||||||
|
# This program is distributed in the hope that it will be useful,
|
||||||
|
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
# GNU General Public License for more details.
|
||||||
|
#
|
||||||
|
# You should have received a copy of the GNU General Public License
|
||||||
|
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
#
|
||||||
|
import os
|
||||||
|
import shutil
|
||||||
|
|
||||||
|
from email.utils import parsedate_to_datetime
|
||||||
|
from pathlib import Path
|
||||||
|
from pyalpm import DB # type: ignore[import-not-found]
|
||||||
|
from urllib.parse import urlparse
|
||||||
|
|
||||||
|
from ahriman.core.configuration import Configuration
|
||||||
|
from ahriman.core.exceptions import PacmanError
|
||||||
|
from ahriman.core.http import SyncHttpClient
|
||||||
|
|
||||||
|
|
||||||
|
class PacmanDatabase(SyncHttpClient):
|
||||||
|
"""
|
||||||
|
implementation for database sync, because pyalpm is not always enough
|
||||||
|
|
||||||
|
Attributes:
|
||||||
|
LAST_MODIFIED_HEADER(str): last modified header name
|
||||||
|
database(DB): pyalpm database object
|
||||||
|
repository_paths(RepositoryPaths): repository paths instance
|
||||||
|
sync_files_database(bool): sync files database
|
||||||
|
"""
|
||||||
|
|
||||||
|
LAST_MODIFIED_HEADER = "Last-Modified"
|
||||||
|
|
||||||
|
def __init__(self, database: DB, configuration: Configuration) -> None:
|
||||||
|
"""
|
||||||
|
default constructor
|
||||||
|
|
||||||
|
Args:
|
||||||
|
database(DB): pyalpm database object
|
||||||
|
configuration(Configuration): configuration instance
|
||||||
|
"""
|
||||||
|
SyncHttpClient.__init__(self)
|
||||||
|
self.timeout = None # reset timeout
|
||||||
|
|
||||||
|
self.database = database
|
||||||
|
self.repository_paths = configuration.repository_paths
|
||||||
|
|
||||||
|
self.sync_files_database = configuration.getboolean("alpm", "sync_files_database")
|
||||||
|
|
||||||
|
def copy(self, remote_path: Path, local_path: Path) -> None:
|
||||||
|
"""
|
||||||
|
copy local database file
|
||||||
|
|
||||||
|
Args:
|
||||||
|
remote_path(Path): path to source (remote) file
|
||||||
|
local_path(Path): path to locally stored file
|
||||||
|
"""
|
||||||
|
shutil.copy(remote_path, local_path)
|
||||||
|
|
||||||
|
def download(self, url: str, local_path: Path) -> None:
|
||||||
|
"""
|
||||||
|
download remote file and store it to local path with the correct last modified headers
|
||||||
|
|
||||||
|
Args:
|
||||||
|
url(str): remote url to request file
|
||||||
|
local_path(Path): path to locally stored file
|
||||||
|
|
||||||
|
Raises:
|
||||||
|
PacmanError: in case if no last-modified header was found
|
||||||
|
"""
|
||||||
|
response = self.make_request("GET", url, stream=True)
|
||||||
|
if self.LAST_MODIFIED_HEADER not in response.headers:
|
||||||
|
raise PacmanError("No last-modified header found")
|
||||||
|
|
||||||
|
with local_path.open("wb") as local_file:
|
||||||
|
for chunk in response.iter_content(chunk_size=1024):
|
||||||
|
local_file.write(chunk)
|
||||||
|
|
||||||
|
# set correct (a,m)time for the file
|
||||||
|
remote_changed = parsedate_to_datetime(response.headers[self.LAST_MODIFIED_HEADER]).timestamp()
|
||||||
|
os.utime(local_path, (remote_changed, remote_changed))
|
||||||
|
|
||||||
|
def is_outdated(self, url: str, local_path: Path) -> bool:
|
||||||
|
"""
|
||||||
|
check if local file is outdated
|
||||||
|
|
||||||
|
Args:
|
||||||
|
url(str): remote url to request last modified header
|
||||||
|
local_path(Path): path to locally stored file
|
||||||
|
|
||||||
|
Returns:
|
||||||
|
bool: True in case if remote file is newer than local file
|
||||||
|
|
||||||
|
Raises:
|
||||||
|
PacmanError: in case if no last-modified header was found
|
||||||
|
"""
|
||||||
|
if not local_path.is_file():
|
||||||
|
return True # no local file found, requires to update
|
||||||
|
|
||||||
|
response = self.make_request("HEAD", url)
|
||||||
|
if self.LAST_MODIFIED_HEADER not in response.headers:
|
||||||
|
raise PacmanError("No last-modified header found")
|
||||||
|
|
||||||
|
remote_changed = parsedate_to_datetime(response.headers["Last-Modified"]).timestamp()
|
||||||
|
local_changed = local_path.stat().st_mtime
|
||||||
|
|
||||||
|
return remote_changed > local_changed
|
||||||
|
|
||||||
|
def sync(self, *, force: bool) -> None:
|
||||||
|
"""
|
||||||
|
sync packages and files databases
|
||||||
|
|
||||||
|
Args:
|
||||||
|
force(bool): force database synchronization (same as ``pacman -Syy``)
|
||||||
|
"""
|
||||||
|
try:
|
||||||
|
self.sync_packages(force=force)
|
||||||
|
if self.sync_files_database:
|
||||||
|
self.sync_files(force=force)
|
||||||
|
except Exception:
|
||||||
|
self.logger.exception("exception during update %s", self.database.name)
|
||||||
|
|
||||||
|
def sync_files(self, *, force: bool) -> None:
|
||||||
|
"""
|
||||||
|
sync files by using http request
|
||||||
|
|
||||||
|
Args:
|
||||||
|
force(bool): force database synchronization (same as ``pacman -Syy``)
|
||||||
|
"""
|
||||||
|
server = next(iter(self.database.servers))
|
||||||
|
filename = f"{self.database.name}.files.tar.gz"
|
||||||
|
url = f"{server}/{filename}"
|
||||||
|
|
||||||
|
remote_uri = urlparse(url)
|
||||||
|
local_path = Path(self.repository_paths.pacman / "sync" / filename)
|
||||||
|
|
||||||
|
match remote_uri.scheme:
|
||||||
|
case "http" | "https":
|
||||||
|
if not force and not self.is_outdated(url, local_path):
|
||||||
|
return
|
||||||
|
|
||||||
|
self.download(url, local_path)
|
||||||
|
|
||||||
|
case "file":
|
||||||
|
# just copy file as it is relatively cheap operation, no need to check timestamps
|
||||||
|
self.copy(Path(remote_uri.path), local_path)
|
||||||
|
|
||||||
|
case other:
|
||||||
|
raise PacmanError(f"Unknown or unsupported URL scheme {other}")
|
||||||
|
|
||||||
|
def sync_packages(self, *, force: bool) -> None:
|
||||||
|
"""
|
||||||
|
sync packages by using built-in pyalpm methods
|
||||||
|
|
||||||
|
Args:
|
||||||
|
force(bool): force database synchronization (same as ``pacman -Syy``)
|
||||||
|
"""
|
||||||
|
self.database.update(force)
|
||||||
@ -56,6 +56,6 @@ class OfficialSyncdb(Official):
|
|||||||
raise UnknownPackageError(package_name)
|
raise UnknownPackageError(package_name)
|
||||||
|
|
||||||
try:
|
try:
|
||||||
return next(AURPackage.from_pacman(package) for package in pacman.package_get(package_name))
|
return next(AURPackage.from_pacman(package) for package in pacman.package(package_name))
|
||||||
except StopIteration:
|
except StopIteration:
|
||||||
raise UnknownPackageError(package_name) from None
|
raise UnknownPackageError(package_name) from None
|
||||||
|
|||||||
@ -68,7 +68,7 @@ class Repo(LazyLogging):
|
|||||||
path(Path): path to archive to add
|
path(Path): path to archive to add
|
||||||
"""
|
"""
|
||||||
check_output(
|
check_output(
|
||||||
"repo-add", *self.sign_args, "-R", str(self.repo_path), str(path),
|
"repo-add", *self.sign_args, "--remove", str(self.repo_path), str(path),
|
||||||
exception=BuildError.from_process(path.name),
|
exception=BuildError.from_process(path.name),
|
||||||
cwd=self.paths.repository,
|
cwd=self.paths.repository,
|
||||||
logger=self.logger,
|
logger=self.logger,
|
||||||
@ -78,8 +78,13 @@ class Repo(LazyLogging):
|
|||||||
"""
|
"""
|
||||||
create empty repository database. It just calls add with empty arguments
|
create empty repository database. It just calls add with empty arguments
|
||||||
"""
|
"""
|
||||||
check_output("repo-add", *self.sign_args, str(self.repo_path),
|
# since pacman-6.1.0 repo-add doesn't create empty database in case if no packages supplied
|
||||||
cwd=self.paths.repository, logger=self.logger, user=self.uid)
|
# this code creates empty files instead
|
||||||
|
if self.repo_path.exists():
|
||||||
|
return # database is already created, skip this part
|
||||||
|
|
||||||
|
self.repo_path.touch(exist_ok=True)
|
||||||
|
(self.paths.repository / f"{self.name}.db").symlink_to(self.repo_path)
|
||||||
|
|
||||||
def remove(self, package: str, filename: Path) -> None:
|
def remove(self, package: str, filename: Path) -> None:
|
||||||
"""
|
"""
|
||||||
|
|||||||
@ -69,7 +69,8 @@ class OAuth(Mapping):
|
|||||||
Returns:
|
Returns:
|
||||||
str: login control as html code to insert
|
str: login control as html code to insert
|
||||||
"""
|
"""
|
||||||
return f"""<a class="nav-link" href="/api/v1/login" title="login via OAuth2"><i class="bi bi-{self.icon}"></i> login</a>"""
|
return f"""<a class="nav-link" href="/api/v1/login" title="login via OAuth2"><i class="bi bi-{
|
||||||
|
self.icon}"></i> login</a>"""
|
||||||
|
|
||||||
@staticmethod
|
@staticmethod
|
||||||
def get_provider(name: str) -> type[aioauth_client.OAuth2Client]:
|
def get_provider(name: str) -> type[aioauth_client.OAuth2Client]:
|
||||||
|
|||||||
@ -38,6 +38,7 @@ class Task(LazyLogging):
|
|||||||
archbuild_flags(list[str]): command flags for archbuild command
|
archbuild_flags(list[str]): command flags for archbuild command
|
||||||
architecture(str): repository architecture
|
architecture(str): repository architecture
|
||||||
build_command(str): build command
|
build_command(str): build command
|
||||||
|
include_debug_packages(bool): whether to include debug packages or not
|
||||||
makechrootpkg_flags(list[str]): command flags for makechrootpkg command
|
makechrootpkg_flags(list[str]): command flags for makechrootpkg command
|
||||||
makepkg_flags(list[str]): command flags for makepkg command
|
makepkg_flags(list[str]): command flags for makepkg command
|
||||||
package(Package): package definitions
|
package(Package): package definitions
|
||||||
@ -63,6 +64,7 @@ class Task(LazyLogging):
|
|||||||
|
|
||||||
self.archbuild_flags = configuration.getlist("build", "archbuild_flags", fallback=[])
|
self.archbuild_flags = configuration.getlist("build", "archbuild_flags", fallback=[])
|
||||||
self.build_command = configuration.get("build", "build_command")
|
self.build_command = configuration.get("build", "build_command")
|
||||||
|
self.include_debug_packages = configuration.getboolean("build", "include_debug_packages", fallback=True)
|
||||||
self.makepkg_flags = configuration.getlist("build", "makepkg_flags", fallback=[])
|
self.makepkg_flags = configuration.getlist("build", "makepkg_flags", fallback=[])
|
||||||
self.makechrootpkg_flags = configuration.getlist("build", "makechrootpkg_flags", fallback=[])
|
self.makechrootpkg_flags = configuration.getlist("build", "makechrootpkg_flags", fallback=[])
|
||||||
|
|
||||||
@ -99,15 +101,20 @@ class Task(LazyLogging):
|
|||||||
environment=environment,
|
environment=environment,
|
||||||
)
|
)
|
||||||
|
|
||||||
# well it is not actually correct, but we can deal with it
|
package_list_command = ["makepkg", "--packagelist"]
|
||||||
|
if not self.include_debug_packages:
|
||||||
|
package_list_command.append("OPTIONS=(!debug)") # disable debug flag manually
|
||||||
packages = check_output(
|
packages = check_output(
|
||||||
"makepkg", "--packagelist",
|
*package_list_command,
|
||||||
exception=BuildError.from_process(self.package.base),
|
exception=BuildError.from_process(self.package.base),
|
||||||
cwd=sources_dir,
|
cwd=sources_dir,
|
||||||
logger=self.logger,
|
logger=self.logger,
|
||||||
environment=environment,
|
environment=environment,
|
||||||
).splitlines()
|
).splitlines()
|
||||||
return [Path(package) for package in packages]
|
# some dirty magic here
|
||||||
|
# the filter is applied in order to make sure that result will only contain packages which were actually built
|
||||||
|
# e.g. in some cases packagelist command produces debug packages which were not actually built
|
||||||
|
return list(filter(lambda path: path.is_file(), map(Path, packages)))
|
||||||
|
|
||||||
def init(self, sources_dir: Path, database: SQLite, local_version: str | None) -> str | None:
|
def init(self, sources_dir: Path, database: SQLite, local_version: str | None) -> str | None:
|
||||||
"""
|
"""
|
||||||
|
|||||||
@ -89,6 +89,11 @@ CONFIGURATION_SCHEMA: ConfigurationSchema = {
|
|||||||
"path_exists": True,
|
"path_exists": True,
|
||||||
"path_type": "dir",
|
"path_type": "dir",
|
||||||
},
|
},
|
||||||
|
"sync_files_database": {
|
||||||
|
"type": "boolean",
|
||||||
|
"coerce": "boolean",
|
||||||
|
"required": True,
|
||||||
|
},
|
||||||
"use_ahriman_cache": {
|
"use_ahriman_cache": {
|
||||||
"type": "boolean",
|
"type": "boolean",
|
||||||
"coerce": "boolean",
|
"coerce": "boolean",
|
||||||
@ -176,6 +181,10 @@ CONFIGURATION_SCHEMA: ConfigurationSchema = {
|
|||||||
"empty": False,
|
"empty": False,
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
"include_debug_packages": {
|
||||||
|
"type": "boolean",
|
||||||
|
"coerce": "boolean",
|
||||||
|
},
|
||||||
"makepkg_flags": {
|
"makepkg_flags": {
|
||||||
"type": "list",
|
"type": "list",
|
||||||
"coerce": "list",
|
"coerce": "list",
|
||||||
|
|||||||
32
src/ahriman/core/database/migrations/m013_dependencies.py
Normal file
32
src/ahriman/core/database/migrations/m013_dependencies.py
Normal file
@ -0,0 +1,32 @@
|
|||||||
|
#
|
||||||
|
# Copyright (c) 2021-2024 ahriman team.
|
||||||
|
#
|
||||||
|
# This file is part of ahriman
|
||||||
|
# (see https://github.com/arcan1s/ahriman).
|
||||||
|
#
|
||||||
|
# This program is free software: you can redistribute it and/or modify
|
||||||
|
# it under the terms of the GNU General Public License as published by
|
||||||
|
# the Free Software Foundation, either version 3 of the License, or
|
||||||
|
# (at your option) any later version.
|
||||||
|
#
|
||||||
|
# This program is distributed in the hope that it will be useful,
|
||||||
|
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
# GNU General Public License for more details.
|
||||||
|
#
|
||||||
|
# You should have received a copy of the GNU General Public License
|
||||||
|
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
#
|
||||||
|
__all__ = ["steps"]
|
||||||
|
|
||||||
|
|
||||||
|
steps = [
|
||||||
|
"""
|
||||||
|
create table package_dependencies (
|
||||||
|
package_base text not null,
|
||||||
|
repository text not null,
|
||||||
|
dependencies json not null,
|
||||||
|
unique (package_base, repository)
|
||||||
|
)
|
||||||
|
""",
|
||||||
|
]
|
||||||
@ -20,6 +20,7 @@
|
|||||||
from ahriman.core.database.operations.auth_operations import AuthOperations
|
from ahriman.core.database.operations.auth_operations import AuthOperations
|
||||||
from ahriman.core.database.operations.build_operations import BuildOperations
|
from ahriman.core.database.operations.build_operations import BuildOperations
|
||||||
from ahriman.core.database.operations.changes_operations import ChangesOperations
|
from ahriman.core.database.operations.changes_operations import ChangesOperations
|
||||||
|
from ahriman.core.database.operations.dependencies_operations import DependenciesOperations
|
||||||
from ahriman.core.database.operations.logs_operations import LogsOperations
|
from ahriman.core.database.operations.logs_operations import LogsOperations
|
||||||
from ahriman.core.database.operations.package_operations import PackageOperations
|
from ahriman.core.database.operations.package_operations import PackageOperations
|
||||||
from ahriman.core.database.operations.patch_operations import PatchOperations
|
from ahriman.core.database.operations.patch_operations import PatchOperations
|
||||||
|
|||||||
@ -64,7 +64,7 @@ class ChangesOperations(Operations):
|
|||||||
|
|
||||||
def changes_insert(self, package_base: str, changes: Changes, repository_id: RepositoryId | None = None) -> None:
|
def changes_insert(self, package_base: str, changes: Changes, repository_id: RepositoryId | None = None) -> None:
|
||||||
"""
|
"""
|
||||||
insert packages to build queue
|
insert package changes
|
||||||
|
|
||||||
Args:
|
Args:
|
||||||
package_base(str): package base to insert
|
package_base(str): package base to insert
|
||||||
|
|||||||
124
src/ahriman/core/database/operations/dependencies_operations.py
Normal file
124
src/ahriman/core/database/operations/dependencies_operations.py
Normal file
@ -0,0 +1,124 @@
|
|||||||
|
#
|
||||||
|
# Copyright (c) 2021-2024 ahriman team.
|
||||||
|
#
|
||||||
|
# This file is part of ahriman
|
||||||
|
# (see https://github.com/arcan1s/ahriman).
|
||||||
|
#
|
||||||
|
# This program is free software: you can redistribute it and/or modify
|
||||||
|
# it under the terms of the GNU General Public License as published by
|
||||||
|
# the Free Software Foundation, either version 3 of the License, or
|
||||||
|
# (at your option) any later version.
|
||||||
|
#
|
||||||
|
# This program is distributed in the hope that it will be useful,
|
||||||
|
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
# GNU General Public License for more details.
|
||||||
|
#
|
||||||
|
# You should have received a copy of the GNU General Public License
|
||||||
|
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
#
|
||||||
|
from pathlib import Path
|
||||||
|
from sqlite3 import Connection
|
||||||
|
|
||||||
|
from ahriman.core.database.operations.operations import Operations
|
||||||
|
from ahriman.models.dependencies import Dependencies
|
||||||
|
from ahriman.models.repository_id import RepositoryId
|
||||||
|
|
||||||
|
|
||||||
|
class DependenciesOperations(Operations):
|
||||||
|
"""
|
||||||
|
operations for dependencies table
|
||||||
|
"""
|
||||||
|
|
||||||
|
def dependencies_get(self, package_base: str | None = None,
|
||||||
|
repository_id: RepositoryId | None = None) -> list[Dependencies]:
|
||||||
|
"""
|
||||||
|
get dependencies for the specific package base if available
|
||||||
|
|
||||||
|
Args:
|
||||||
|
package_base(str | None): package base to search
|
||||||
|
repository_id(RepositoryId, optional): repository unique identifier override (Default value = None)
|
||||||
|
|
||||||
|
Returns:
|
||||||
|
Dependencies: changes for the package base if available
|
||||||
|
"""
|
||||||
|
repository_id = repository_id or self._repository_id
|
||||||
|
|
||||||
|
def run(connection: Connection) -> list[Dependencies]:
|
||||||
|
return [
|
||||||
|
Dependencies(
|
||||||
|
row["package_base"],
|
||||||
|
{
|
||||||
|
Path(path): packages
|
||||||
|
for path, packages in row["dependencies"].items()
|
||||||
|
}
|
||||||
|
)
|
||||||
|
for row in connection.execute(
|
||||||
|
"""
|
||||||
|
select package_base, dependencies from package_dependencies
|
||||||
|
where (:package_base is null or package_base = :package_base)
|
||||||
|
and repository = :repository
|
||||||
|
""",
|
||||||
|
{
|
||||||
|
"package_base": package_base,
|
||||||
|
"repository": repository_id.id,
|
||||||
|
}
|
||||||
|
)
|
||||||
|
]
|
||||||
|
|
||||||
|
return self.with_connection(run)
|
||||||
|
|
||||||
|
def dependencies_insert(self, dependencies: Dependencies, repository_id: RepositoryId | None = None) -> None:
|
||||||
|
"""
|
||||||
|
insert package dependencies
|
||||||
|
|
||||||
|
Args:
|
||||||
|
dependencies(Dependencies): package dependencies
|
||||||
|
repository_id(RepositoryId, optional): repository unique identifier override (Default value = None)
|
||||||
|
"""
|
||||||
|
repository_id = repository_id or self._repository_id
|
||||||
|
|
||||||
|
def run(connection: Connection) -> None:
|
||||||
|
connection.execute(
|
||||||
|
"""
|
||||||
|
insert into package_dependencies
|
||||||
|
(package_base, repository, dependencies)
|
||||||
|
values
|
||||||
|
(:package_base, :repository, :dependencies)
|
||||||
|
on conflict (package_base, repository) do update set
|
||||||
|
dependencies = :dependencies
|
||||||
|
""",
|
||||||
|
{
|
||||||
|
"package_base": dependencies.package_base,
|
||||||
|
"repository": repository_id.id,
|
||||||
|
"dependencies": {
|
||||||
|
str(path): packages
|
||||||
|
for path, packages in dependencies.paths.items()
|
||||||
|
}
|
||||||
|
})
|
||||||
|
|
||||||
|
return self.with_connection(run, commit=True)
|
||||||
|
|
||||||
|
def dependencies_remove(self, package_base: str | None, repository_id: RepositoryId | None = None) -> None:
|
||||||
|
"""
|
||||||
|
remove packages dependencies
|
||||||
|
|
||||||
|
Args:
|
||||||
|
package_base(str | None): optional filter by package base
|
||||||
|
repository_id(RepositoryId, optional): repository unique identifier override (Default value = None)
|
||||||
|
"""
|
||||||
|
repository_id = repository_id or self._repository_id
|
||||||
|
|
||||||
|
def run(connection: Connection) -> None:
|
||||||
|
connection.execute(
|
||||||
|
"""
|
||||||
|
delete from package_dependencies
|
||||||
|
where (:package_base is null or package_base = :package_base)
|
||||||
|
and repository = :repository
|
||||||
|
""",
|
||||||
|
{
|
||||||
|
"package_base": package_base,
|
||||||
|
"repository": repository_id.id,
|
||||||
|
})
|
||||||
|
|
||||||
|
return self.with_connection(run, commit=True)
|
||||||
@ -25,12 +25,19 @@ from typing import Self
|
|||||||
|
|
||||||
from ahriman.core.configuration import Configuration
|
from ahriman.core.configuration import Configuration
|
||||||
from ahriman.core.database.migrations import Migrations
|
from ahriman.core.database.migrations import Migrations
|
||||||
from ahriman.core.database.operations import AuthOperations, BuildOperations, ChangesOperations, LogsOperations, \
|
from ahriman.core.database.operations import AuthOperations, BuildOperations, ChangesOperations, \
|
||||||
PackageOperations, PatchOperations
|
DependenciesOperations, LogsOperations, PackageOperations, PatchOperations
|
||||||
|
|
||||||
|
|
||||||
# pylint: disable=too-many-ancestors
|
# pylint: disable=too-many-ancestors
|
||||||
class SQLite(AuthOperations, BuildOperations, ChangesOperations, LogsOperations, PackageOperations, PatchOperations):
|
class SQLite(
|
||||||
|
AuthOperations,
|
||||||
|
BuildOperations,
|
||||||
|
ChangesOperations,
|
||||||
|
DependenciesOperations,
|
||||||
|
LogsOperations,
|
||||||
|
PackageOperations,
|
||||||
|
PatchOperations):
|
||||||
"""
|
"""
|
||||||
wrapper for sqlite3 database
|
wrapper for sqlite3 database
|
||||||
|
|
||||||
@ -94,3 +101,21 @@ class SQLite(AuthOperations, BuildOperations, ChangesOperations, LogsOperations,
|
|||||||
if configuration.getboolean("settings", "apply_migrations", fallback=True):
|
if configuration.getboolean("settings", "apply_migrations", fallback=True):
|
||||||
self.with_connection(lambda connection: Migrations.migrate(connection, configuration))
|
self.with_connection(lambda connection: Migrations.migrate(connection, configuration))
|
||||||
paths.chown(self.path)
|
paths.chown(self.path)
|
||||||
|
|
||||||
|
def package_clear(self, package_base: str) -> None:
|
||||||
|
"""
|
||||||
|
completely remove package from all tables
|
||||||
|
|
||||||
|
Args:
|
||||||
|
package_base(str): package base to remove
|
||||||
|
|
||||||
|
Examples:
|
||||||
|
This method completely removes the package from all tables and must be used, e.g. on package removal::
|
||||||
|
|
||||||
|
>>> database.package_clear("ahriman")
|
||||||
|
"""
|
||||||
|
self.build_queue_clear(package_base)
|
||||||
|
self.patches_remove(package_base, [])
|
||||||
|
self.logs_remove(package_base, None)
|
||||||
|
self.changes_remove(package_base)
|
||||||
|
self.dependencies_remove(package_base)
|
||||||
|
|||||||
@ -219,6 +219,21 @@ class PackageInfoError(RuntimeError):
|
|||||||
RuntimeError.__init__(self, f"There are errors during reading package information: `{details}`")
|
RuntimeError.__init__(self, f"There are errors during reading package information: `{details}`")
|
||||||
|
|
||||||
|
|
||||||
|
class PacmanError(RuntimeError):
|
||||||
|
"""
|
||||||
|
exception in case of pacman operation errors
|
||||||
|
"""
|
||||||
|
|
||||||
|
def __init__(self, details: Any) -> None:
|
||||||
|
"""
|
||||||
|
default constructor
|
||||||
|
|
||||||
|
Args:
|
||||||
|
details(Any): error details
|
||||||
|
"""
|
||||||
|
RuntimeError.__init__(self, f"Could not perform operation with pacman: `{details}`")
|
||||||
|
|
||||||
|
|
||||||
class PathError(ValueError):
|
class PathError(ValueError):
|
||||||
"""
|
"""
|
||||||
exception which will be raised on path which is not belong to root directory
|
exception which will be raised on path which is not belong to root directory
|
||||||
@ -330,5 +345,5 @@ class UnsafeRunError(RuntimeError):
|
|||||||
root_uid(int): ID of the owner of root directory
|
root_uid(int): ID of the owner of root directory
|
||||||
"""
|
"""
|
||||||
RuntimeError.__init__(self, f"Current UID {current_uid} differs from root owner {root_uid}. "
|
RuntimeError.__init__(self, f"Current UID {current_uid} differs from root owner {root_uid}. "
|
||||||
f"Note that for the most actions it is unsafe to run application as different user."
|
f"Note that for the most actions it is unsafe to run application as different user."
|
||||||
f" If you are 100% sure that it must be there try --unsafe option")
|
f" If you are 100% sure that it must be there try --unsafe option")
|
||||||
|
|||||||
@ -22,7 +22,6 @@ from ahriman.core.configuration import Configuration
|
|||||||
from ahriman.core.database import SQLite
|
from ahriman.core.database import SQLite
|
||||||
from ahriman.core.gitremote.remote_push import RemotePush
|
from ahriman.core.gitremote.remote_push import RemotePush
|
||||||
from ahriman.core.triggers import Trigger
|
from ahriman.core.triggers import Trigger
|
||||||
from ahriman.models.context_key import ContextKey
|
|
||||||
from ahriman.models.package import Package
|
from ahriman.models.package import Package
|
||||||
from ahriman.models.repository_id import RepositoryId
|
from ahriman.models.repository_id import RepositoryId
|
||||||
from ahriman.models.result import Result
|
from ahriman.models.result import Result
|
||||||
@ -111,7 +110,7 @@ class RemotePushTrigger(Trigger):
|
|||||||
GitRemoteError: if database is not set in context
|
GitRemoteError: if database is not set in context
|
||||||
"""
|
"""
|
||||||
ctx = context.get()
|
ctx = context.get()
|
||||||
database = ctx.get(ContextKey("database", SQLite))
|
database = ctx.get(SQLite)
|
||||||
|
|
||||||
for target in self.targets:
|
for target in self.targets:
|
||||||
section, _ = self.configuration.gettype(
|
section, _ = self.configuration.gettype(
|
||||||
|
|||||||
@ -38,7 +38,7 @@ class SyncHttpClient(LazyLogging):
|
|||||||
Attributes:
|
Attributes:
|
||||||
auth(tuple[str, str] | None): HTTP basic auth object if set
|
auth(tuple[str, str] | None): HTTP basic auth object if set
|
||||||
suppress_errors(bool): suppress logging of request errors
|
suppress_errors(bool): suppress logging of request errors
|
||||||
timeout(int): HTTP request timeout in seconds
|
timeout(int | None): HTTP request timeout in seconds
|
||||||
"""
|
"""
|
||||||
|
|
||||||
def __init__(self, configuration: Configuration | None = None, section: str | None = None, *,
|
def __init__(self, configuration: Configuration | None = None, section: str | None = None, *,
|
||||||
@ -60,7 +60,7 @@ class SyncHttpClient(LazyLogging):
|
|||||||
password = configuration.get(section, "password", fallback=None)
|
password = configuration.get(section, "password", fallback=None)
|
||||||
self.auth = (username, password) if username and password else None
|
self.auth = (username, password) if username and password else None
|
||||||
|
|
||||||
self.timeout = configuration.getint(section, "timeout", fallback=30)
|
self.timeout: int | None = configuration.getint(section, "timeout", fallback=30)
|
||||||
self.suppress_errors = suppress_errors
|
self.suppress_errors = suppress_errors
|
||||||
|
|
||||||
@cached_property
|
@cached_property
|
||||||
@ -90,25 +90,27 @@ class SyncHttpClient(LazyLogging):
|
|||||||
result: str = exception.response.text if exception.response is not None else ""
|
result: str = exception.response.text if exception.response is not None else ""
|
||||||
return result
|
return result
|
||||||
|
|
||||||
def make_request(self, method: Literal["DELETE", "GET", "POST", "PUT"], url: str, *,
|
def make_request(self, method: Literal["DELETE", "GET", "HEAD", "POST", "PUT"], url: str, *,
|
||||||
headers: dict[str, str] | None = None,
|
headers: dict[str, str] | None = None,
|
||||||
params: list[tuple[str, str]] | None = None,
|
params: list[tuple[str, str]] | None = None,
|
||||||
data: Any | None = None,
|
data: Any | None = None,
|
||||||
json: dict[str, Any] | None = None,
|
json: dict[str, Any] | None = None,
|
||||||
files: dict[str, MultipartType] | None = None,
|
files: dict[str, MultipartType] | None = None,
|
||||||
|
stream: bool | None = None,
|
||||||
session: requests.Session | None = None,
|
session: requests.Session | None = None,
|
||||||
suppress_errors: bool | None = None) -> requests.Response:
|
suppress_errors: bool | None = None) -> requests.Response:
|
||||||
"""
|
"""
|
||||||
perform request with specified parameters
|
perform request with specified parameters
|
||||||
|
|
||||||
Args:
|
Args:
|
||||||
method(Literal["DELETE", "GET", "POST", "PUT"]): HTTP method to call
|
method(Literal["DELETE", "GET", "HEAD", "POST", "PUT"]): HTTP method to call
|
||||||
url(str): remote url to call
|
url(str): remote url to call
|
||||||
headers(dict[str, str] | None, optional): request headers (Default value = None)
|
headers(dict[str, str] | None, optional): request headers (Default value = None)
|
||||||
params(list[tuple[str, str]] | None, optional): request query parameters (Default value = None)
|
params(list[tuple[str, str]] | None, optional): request query parameters (Default value = None)
|
||||||
data(Any | None, optional): request raw data parameters (Default value = None)
|
data(Any | None, optional): request raw data parameters (Default value = None)
|
||||||
json(dict[str, Any] | None, optional): request json parameters (Default value = None)
|
json(dict[str, Any] | None, optional): request json parameters (Default value = None)
|
||||||
files(dict[str, MultipartType] | None, optional): multipart upload (Default value = None)
|
files(dict[str, MultipartType] | None, optional): multipart upload (Default value = None)
|
||||||
|
stream(bool | None, optional): handle response as stream (Default value = None)
|
||||||
session(requests.Session | None, optional): session object if any (Default value = None)
|
session(requests.Session | None, optional): session object if any (Default value = None)
|
||||||
suppress_errors(bool | None, optional): suppress logging errors (e.g. if no web server available). If none
|
suppress_errors(bool | None, optional): suppress logging errors (e.g. if no web server available). If none
|
||||||
set, the instance-wide value will be used (Default value = None)
|
set, the instance-wide value will be used (Default value = None)
|
||||||
@ -124,7 +126,7 @@ class SyncHttpClient(LazyLogging):
|
|||||||
|
|
||||||
try:
|
try:
|
||||||
response = session.request(method, url, params=params, data=data, headers=headers, files=files, json=json,
|
response = session.request(method, url, params=params, data=data, headers=headers, files=files, json=json,
|
||||||
auth=self.auth, timeout=self.timeout)
|
stream=stream, auth=self.auth, timeout=self.timeout)
|
||||||
response.raise_for_status()
|
response.raise_for_status()
|
||||||
return response
|
return response
|
||||||
except requests.HTTPError as ex:
|
except requests.HTTPError as ex:
|
||||||
|
|||||||
@ -106,7 +106,7 @@ class RemoteCall(Report):
|
|||||||
"aur": self.update_aur,
|
"aur": self.update_aur,
|
||||||
"local": self.update_local,
|
"local": self.update_local,
|
||||||
"manual": self.update_manual,
|
"manual": self.update_manual,
|
||||||
})
|
})
|
||||||
response_json = response.json()
|
response_json = response.json()
|
||||||
|
|
||||||
process_id: str = response_json["process_id"]
|
process_id: str = response_json["process_id"]
|
||||||
|
|||||||
@ -29,6 +29,7 @@ from ahriman.core.repository.package_info import PackageInfo
|
|||||||
from ahriman.core.util import safe_filename
|
from ahriman.core.util import safe_filename
|
||||||
from ahriman.models.changes import Changes
|
from ahriman.models.changes import Changes
|
||||||
from ahriman.models.package import Package
|
from ahriman.models.package import Package
|
||||||
|
from ahriman.models.package_archive import PackageArchive
|
||||||
from ahriman.models.package_description import PackageDescription
|
from ahriman.models.package_description import PackageDescription
|
||||||
from ahriman.models.packagers import Packagers
|
from ahriman.models.packagers import Packagers
|
||||||
from ahriman.models.result import Result
|
from ahriman.models.result import Result
|
||||||
@ -77,6 +78,10 @@ class Executor(PackageInfo, Cleaner):
|
|||||||
last_commit_sha = build_single(single, Path(dir_name), packager.packager_id)
|
last_commit_sha = build_single(single, Path(dir_name), packager.packager_id)
|
||||||
# clear changes and update commit hash
|
# clear changes and update commit hash
|
||||||
self.reporter.package_changes_set(single.base, Changes(last_commit_sha))
|
self.reporter.package_changes_set(single.base, Changes(last_commit_sha))
|
||||||
|
# update dependencies list
|
||||||
|
dependencies = PackageArchive(self.paths.build_directory, single).depends_on()
|
||||||
|
self.database.dependencies_insert(dependencies)
|
||||||
|
# update result set
|
||||||
result.add_updated(single)
|
result.add_updated(single)
|
||||||
except Exception:
|
except Exception:
|
||||||
self.reporter.set_failed(single.base)
|
self.reporter.set_failed(single.base)
|
||||||
@ -98,10 +103,7 @@ class Executor(PackageInfo, Cleaner):
|
|||||||
def remove_base(package_base: str) -> None:
|
def remove_base(package_base: str) -> None:
|
||||||
try:
|
try:
|
||||||
self.paths.tree_clear(package_base) # remove all internal files
|
self.paths.tree_clear(package_base) # remove all internal files
|
||||||
self.database.build_queue_clear(package_base)
|
self.database.package_clear(package_base)
|
||||||
self.database.patches_remove(package_base, [])
|
|
||||||
self.database.logs_remove(package_base, None)
|
|
||||||
self.database.changes_remove(package_base)
|
|
||||||
self.reporter.package_remove(package_base) # we only update status page in case of base removal
|
self.reporter.package_remove(package_base) # we only update status page in case of base removal
|
||||||
except Exception:
|
except Exception:
|
||||||
self.logger.exception("could not remove base %s", package_base)
|
self.logger.exception("could not remove base %s", package_base)
|
||||||
@ -117,7 +119,8 @@ class Executor(PackageInfo, Cleaner):
|
|||||||
|
|
||||||
# build package list based on user input
|
# build package list based on user input
|
||||||
result = Result()
|
result = Result()
|
||||||
requested = set(packages)
|
packages = set(packages) # remove duplicates
|
||||||
|
requested = packages | {f"{package}-debug" for package in packages} # append debug packages
|
||||||
for local in self.packages():
|
for local in self.packages():
|
||||||
if local.base in packages or all(package in requested for package in local.packages):
|
if local.base in packages or all(package in requested for package in local.packages):
|
||||||
packages_to_remove.update({
|
packages_to_remove.update({
|
||||||
@ -136,7 +139,7 @@ class Executor(PackageInfo, Cleaner):
|
|||||||
|
|
||||||
# check for packages which were requested to remove, but weren't found locally
|
# check for packages which were requested to remove, but weren't found locally
|
||||||
# it might happen for example, if there were no success build before
|
# it might happen for example, if there were no success build before
|
||||||
for unknown in requested:
|
for unknown in packages:
|
||||||
if unknown in packages_to_remove or unknown in bases_to_remove:
|
if unknown in packages_to_remove or unknown in bases_to_remove:
|
||||||
continue
|
continue
|
||||||
bases_to_remove.append(unknown)
|
bases_to_remove.append(unknown)
|
||||||
|
|||||||
@ -86,14 +86,21 @@ class PackageInfo(RepositoryProperties):
|
|||||||
|
|
||||||
return Changes(last_commit_sha, changes)
|
return Changes(last_commit_sha, changes)
|
||||||
|
|
||||||
def packages(self) -> list[Package]:
|
def packages(self, filter_packages: Iterable[str] | None = None) -> list[Package]:
|
||||||
"""
|
"""
|
||||||
generate list of repository packages
|
generate list of repository packages
|
||||||
|
|
||||||
|
Args:
|
||||||
|
filter_packages(Iterable[str] | None, optional): filter packages list by specified only
|
||||||
|
|
||||||
Returns:
|
Returns:
|
||||||
list[Package]: list of packages properties
|
list[Package]: list of packages properties
|
||||||
"""
|
"""
|
||||||
return self.load_archives(filter(package_like, self.paths.repository.iterdir()))
|
packages = self.load_archives(filter(package_like, self.paths.repository.iterdir()))
|
||||||
|
if filter_packages:
|
||||||
|
packages = [package for package in packages if package.base in filter_packages]
|
||||||
|
|
||||||
|
return packages
|
||||||
|
|
||||||
def packages_built(self) -> list[Path]:
|
def packages_built(self) -> list[Path]:
|
||||||
"""
|
"""
|
||||||
|
|||||||
@ -26,7 +26,6 @@ from ahriman.core.database import SQLite
|
|||||||
from ahriman.core.repository.executor import Executor
|
from ahriman.core.repository.executor import Executor
|
||||||
from ahriman.core.repository.update_handler import UpdateHandler
|
from ahriman.core.repository.update_handler import UpdateHandler
|
||||||
from ahriman.core.sign.gpg import GPG
|
from ahriman.core.sign.gpg import GPG
|
||||||
from ahriman.models.context_key import ContextKey
|
|
||||||
from ahriman.models.pacman_synchronization import PacmanSynchronization
|
from ahriman.models.pacman_synchronization import PacmanSynchronization
|
||||||
from ahriman.models.repository_id import RepositoryId
|
from ahriman.models.repository_id import RepositoryId
|
||||||
|
|
||||||
@ -89,11 +88,11 @@ class Repository(Executor, UpdateHandler):
|
|||||||
# directly without loader
|
# directly without loader
|
||||||
ctx = _Context()
|
ctx = _Context()
|
||||||
|
|
||||||
ctx.set(ContextKey("database", SQLite), self.database)
|
ctx.set(SQLite, self.database)
|
||||||
ctx.set(ContextKey("configuration", Configuration), self.configuration)
|
ctx.set(Configuration, self.configuration)
|
||||||
ctx.set(ContextKey("pacman", Pacman), self.pacman)
|
ctx.set(Pacman, self.pacman)
|
||||||
ctx.set(ContextKey("sign", GPG), self.sign)
|
ctx.set(GPG, self.sign)
|
||||||
|
|
||||||
ctx.set(ContextKey("repository", type(self)), self)
|
ctx.set(type(self), self)
|
||||||
|
|
||||||
context.set(ctx)
|
context.set(ctx)
|
||||||
|
|||||||
@ -18,6 +18,7 @@
|
|||||||
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
#
|
#
|
||||||
from collections.abc import Iterable
|
from collections.abc import Iterable
|
||||||
|
from pathlib import Path
|
||||||
|
|
||||||
from ahriman.core.build_tools.sources import Sources
|
from ahriman.core.build_tools.sources import Sources
|
||||||
from ahriman.core.exceptions import UnknownPackageError
|
from ahriman.core.exceptions import UnknownPackageError
|
||||||
@ -55,17 +56,13 @@ class UpdateHandler(PackageInfo, Cleaner):
|
|||||||
continue
|
continue
|
||||||
raise UnknownPackageError(package.base)
|
raise UnknownPackageError(package.base)
|
||||||
|
|
||||||
local_versions = {package.base: package.version for package in self.packages()}
|
|
||||||
|
|
||||||
result: list[Package] = []
|
result: list[Package] = []
|
||||||
for local in self.packages():
|
for local in self.packages(filter_packages):
|
||||||
with self.in_package_context(local.base, local_versions.get(local.base)):
|
with self.in_package_context(local.base, local.version):
|
||||||
if not local.remote.is_remote:
|
if not local.remote.is_remote:
|
||||||
continue # avoid checking local packages
|
continue # avoid checking local packages
|
||||||
if local.base in self.ignore_list:
|
if local.base in self.ignore_list:
|
||||||
continue
|
continue
|
||||||
if filter_packages and local.base not in filter_packages:
|
|
||||||
continue
|
|
||||||
|
|
||||||
try:
|
try:
|
||||||
remote = load_remote(local)
|
remote = load_remote(local)
|
||||||
@ -82,6 +79,47 @@ class UpdateHandler(PackageInfo, Cleaner):
|
|||||||
|
|
||||||
return result
|
return result
|
||||||
|
|
||||||
|
def updates_dependencies(self, filter_packages: Iterable[str]) -> list[Package]:
|
||||||
|
"""
|
||||||
|
check packages which ae required to be rebuilt based on dynamic dependencies (e.g. linking, modules paths, etc.)
|
||||||
|
|
||||||
|
Args:
|
||||||
|
filter_packages(Iterable[str]): do not check every package just specified in the list
|
||||||
|
|
||||||
|
Returns:
|
||||||
|
list[Package]: list of packages for which there is breaking linking
|
||||||
|
"""
|
||||||
|
def extract_files(lookup_packages: Iterable[str]) -> dict[Path, set[str]]:
|
||||||
|
database_files = self.pacman.files(lookup_packages)
|
||||||
|
files: dict[Path, set[str]] = {}
|
||||||
|
for package_name, package_files in database_files.items(): # invert map
|
||||||
|
for package_file in package_files:
|
||||||
|
files.setdefault(package_file, set()).add(package_name)
|
||||||
|
|
||||||
|
return files
|
||||||
|
|
||||||
|
dependencies = {dependency.package_base: dependency for dependency in self.database.dependencies_get()}
|
||||||
|
|
||||||
|
result: list[Package] = []
|
||||||
|
for package in self.packages(filter_packages):
|
||||||
|
if package.base not in dependencies:
|
||||||
|
continue # skip check if no package dependencies found
|
||||||
|
|
||||||
|
required = dependencies[package.base].paths
|
||||||
|
required_packages = {dep for dep_packages in required.values() for dep in dep_packages}
|
||||||
|
filesystem = extract_files(required_packages)
|
||||||
|
|
||||||
|
for path, packages in required.items():
|
||||||
|
found = filesystem.get(path, set())
|
||||||
|
if found.intersection(packages):
|
||||||
|
continue
|
||||||
|
|
||||||
|
# there are no packages found in filesystem with the same paths
|
||||||
|
result.append(package)
|
||||||
|
break
|
||||||
|
|
||||||
|
return result
|
||||||
|
|
||||||
def updates_local(self, *, vcs: bool) -> list[Package]:
|
def updates_local(self, *, vcs: bool) -> list[Package]:
|
||||||
"""
|
"""
|
||||||
check local packages for updates
|
check local packages for updates
|
||||||
|
|||||||
@ -24,7 +24,6 @@ from ahriman.core.sign.gpg import GPG
|
|||||||
from ahriman.core.support.package_creator import PackageCreator
|
from ahriman.core.support.package_creator import PackageCreator
|
||||||
from ahriman.core.support.pkgbuild.keyring_generator import KeyringGenerator
|
from ahriman.core.support.pkgbuild.keyring_generator import KeyringGenerator
|
||||||
from ahriman.core.triggers import Trigger
|
from ahriman.core.triggers import Trigger
|
||||||
from ahriman.models.context_key import ContextKey
|
|
||||||
from ahriman.models.repository_id import RepositoryId
|
from ahriman.models.repository_id import RepositoryId
|
||||||
|
|
||||||
|
|
||||||
@ -134,8 +133,8 @@ class KeyringTrigger(Trigger):
|
|||||||
trigger action which will be called at the start of the application
|
trigger action which will be called at the start of the application
|
||||||
"""
|
"""
|
||||||
ctx = context.get()
|
ctx = context.get()
|
||||||
sign = ctx.get(ContextKey("sign", GPG))
|
sign = ctx.get(GPG)
|
||||||
database = ctx.get(ContextKey("database", SQLite))
|
database = ctx.get(SQLite)
|
||||||
|
|
||||||
for target in self.targets:
|
for target in self.targets:
|
||||||
generator = KeyringGenerator(database, sign, self.repository_id, self.configuration, target)
|
generator = KeyringGenerator(database, sign, self.repository_id, self.configuration, target)
|
||||||
|
|||||||
@ -25,7 +25,6 @@ from ahriman.core.configuration import Configuration
|
|||||||
from ahriman.core.database import SQLite
|
from ahriman.core.database import SQLite
|
||||||
from ahriman.core.support.pkgbuild.pkgbuild_generator import PkgbuildGenerator
|
from ahriman.core.support.pkgbuild.pkgbuild_generator import PkgbuildGenerator
|
||||||
from ahriman.models.build_status import BuildStatus
|
from ahriman.models.build_status import BuildStatus
|
||||||
from ahriman.models.context_key import ContextKey
|
|
||||||
from ahriman.models.package import Package
|
from ahriman.models.package import Package
|
||||||
|
|
||||||
|
|
||||||
@ -65,7 +64,7 @@ class PackageCreator:
|
|||||||
|
|
||||||
# register package
|
# register package
|
||||||
ctx = context.get()
|
ctx = context.get()
|
||||||
database: SQLite = ctx.get(ContextKey("database", SQLite))
|
database = ctx.get(SQLite)
|
||||||
_, repository_id = self.configuration.check_loaded()
|
_, repository_id = self.configuration.check_loaded()
|
||||||
package = Package.from_build(local_path, repository_id.architecture, None)
|
package = Package.from_build(local_path, repository_id.architecture, None)
|
||||||
database.package_update(package, BuildStatus())
|
database.package_update(package, BuildStatus())
|
||||||
|
|||||||
@ -183,11 +183,12 @@ post_install() {{
|
|||||||
Returns:
|
Returns:
|
||||||
str: package() function for PKGBUILD
|
str: package() function for PKGBUILD
|
||||||
"""
|
"""
|
||||||
|
# somehow autopep thinks that construction inside contains valid python code and reformats it
|
||||||
return f"""{{
|
return f"""{{
|
||||||
install -Dm644 "{Path("$srcdir") / f"{self.name}.gpg"}" "{Path("$pkgdir") / "usr" / "share" / "pacman" / "keyrings" / f"{self.name}.gpg"}"
|
install -Dm644 "{Path("$srcdir") / f"{self.name}.gpg"}" "{Path("$pkgdir") / "usr" / "share" / "pacman" / "keyrings" / f"{self.name}.gpg"}"
|
||||||
install -Dm644 "{Path("$srcdir") / f"{self.name}-revoked"}" "{Path("$pkgdir") / "usr" / "share" / "pacman" / "keyrings" / f"{self.name}-revoked"}"
|
install -Dm644 "{Path("$srcdir") / f"{self.name}-revoked"}" "{Path("$pkgdir") / "usr" / "share" / "pacman" / "keyrings" / f"{self.name}-revoked"}"
|
||||||
install -Dm644 "{Path("$srcdir") / f"{self.name}-trusted"}" "{Path("$pkgdir") / "usr" / "share" / "pacman" / "keyrings" / f"{self.name}-trusted"}"
|
install -Dm644 "{Path("$srcdir") / f"{self.name}-trusted"}" "{Path("$pkgdir") / "usr" / "share" / "pacman" / "keyrings" / f"{self.name}-trusted"}"
|
||||||
}}"""
|
}}""" # nopep8
|
||||||
|
|
||||||
def sources(self) -> dict[str, Callable[[Path], None]]:
|
def sources(self) -> dict[str, Callable[[Path], None]]:
|
||||||
"""
|
"""
|
||||||
|
|||||||
@ -162,7 +162,8 @@ class GitHub(Upload, HttpUpload):
|
|||||||
Returns:
|
Returns:
|
||||||
dict[str, Any] | None: GitHub API release object if release found and None otherwise
|
dict[str, Any] | None: GitHub API release object if release found and None otherwise
|
||||||
"""
|
"""
|
||||||
url = f"https://api.github.com/repos/{self.github_owner}/{self.github_repository}/releases/tags/{self.github_release_tag}"
|
url = f"https://api.github.com/repos/{self.github_owner}/{
|
||||||
|
self.github_repository}/releases/tags/{self.github_release_tag}"
|
||||||
try:
|
try:
|
||||||
response = self.make_request("GET", url)
|
response = self.make_request("GET", url)
|
||||||
release: dict[str, Any] = response.json()
|
release: dict[str, Any] = response.json()
|
||||||
|
|||||||
@ -56,7 +56,6 @@ __all__ = [
|
|||||||
"srcinfo_property",
|
"srcinfo_property",
|
||||||
"srcinfo_property_list",
|
"srcinfo_property_list",
|
||||||
"trim_package",
|
"trim_package",
|
||||||
"unquote",
|
|
||||||
"utcnow",
|
"utcnow",
|
||||||
"walk",
|
"walk",
|
||||||
]
|
]
|
||||||
@ -349,7 +348,7 @@ def pretty_datetime(timestamp: datetime.datetime | float | int | None) -> str:
|
|||||||
if timestamp is None:
|
if timestamp is None:
|
||||||
return ""
|
return ""
|
||||||
if isinstance(timestamp, (int, float)):
|
if isinstance(timestamp, (int, float)):
|
||||||
timestamp = datetime.datetime.utcfromtimestamp(timestamp)
|
timestamp = datetime.datetime.fromtimestamp(timestamp, datetime.UTC)
|
||||||
return timestamp.strftime("%Y-%m-%d %H:%M:%S")
|
return timestamp.strftime("%Y-%m-%d %H:%M:%S")
|
||||||
|
|
||||||
|
|
||||||
@ -466,38 +465,6 @@ def trim_package(package_name: str) -> str:
|
|||||||
return package_name
|
return package_name
|
||||||
|
|
||||||
|
|
||||||
def unquote(source: str) -> str:
|
|
||||||
"""
|
|
||||||
like :func:`shlex.quote()`, but opposite
|
|
||||||
|
|
||||||
Args:
|
|
||||||
source(str): source string to remove quotes
|
|
||||||
|
|
||||||
Returns:
|
|
||||||
str: string with quotes removed
|
|
||||||
|
|
||||||
Raises:
|
|
||||||
ValueError: if no closing quotation
|
|
||||||
"""
|
|
||||||
def generator() -> Generator[str, None, None]:
|
|
||||||
token = None
|
|
||||||
for char in source:
|
|
||||||
if token is not None:
|
|
||||||
if char == token:
|
|
||||||
token = None # closed quote
|
|
||||||
else:
|
|
||||||
yield char # character inside quotes
|
|
||||||
elif char in ("'", "\""):
|
|
||||||
token = char # first quote found
|
|
||||||
else:
|
|
||||||
yield char # normal character
|
|
||||||
|
|
||||||
if token is not None:
|
|
||||||
raise ValueError("No closing quotation")
|
|
||||||
|
|
||||||
return "".join(generator())
|
|
||||||
|
|
||||||
|
|
||||||
def utcnow() -> datetime.datetime:
|
def utcnow() -> datetime.datetime:
|
||||||
"""
|
"""
|
||||||
get current time
|
get current time
|
||||||
@ -505,7 +472,7 @@ def utcnow() -> datetime.datetime:
|
|||||||
Returns:
|
Returns:
|
||||||
datetime.datetime: current time in UTC
|
datetime.datetime: current time in UTC
|
||||||
"""
|
"""
|
||||||
return datetime.datetime.utcnow()
|
return datetime.datetime.now(datetime.UTC)
|
||||||
|
|
||||||
|
|
||||||
def walk(directory_path: Path) -> Generator[Path, None, None]:
|
def walk(directory_path: Path) -> Generator[Path, None, None]:
|
||||||
|
|||||||
@ -137,8 +137,8 @@ class AURPackage:
|
|||||||
description=package.desc,
|
description=package.desc,
|
||||||
num_votes=0,
|
num_votes=0,
|
||||||
popularity=0.0,
|
popularity=0.0,
|
||||||
first_submitted=datetime.datetime.utcfromtimestamp(0),
|
first_submitted=datetime.datetime.fromtimestamp(0, datetime.UTC),
|
||||||
last_modified=datetime.datetime.utcfromtimestamp(package.builddate),
|
last_modified=datetime.datetime.fromtimestamp(package.builddate, datetime.UTC),
|
||||||
url_path="",
|
url_path="",
|
||||||
url=package.url,
|
url=package.url,
|
||||||
out_of_date=None,
|
out_of_date=None,
|
||||||
@ -175,13 +175,11 @@ class AURPackage:
|
|||||||
description=dump["pkgdesc"],
|
description=dump["pkgdesc"],
|
||||||
num_votes=0,
|
num_votes=0,
|
||||||
popularity=0.0,
|
popularity=0.0,
|
||||||
first_submitted=datetime.datetime.utcfromtimestamp(0),
|
first_submitted=datetime.datetime.fromtimestamp(0, datetime.UTC),
|
||||||
last_modified=datetime.datetime.strptime(dump["last_update"], "%Y-%m-%dT%H:%M:%S.%fZ"),
|
last_modified=datetime.datetime.fromisoformat(dump["last_update"]),
|
||||||
url_path="",
|
url_path="",
|
||||||
url=dump["url"],
|
url=dump["url"],
|
||||||
out_of_date=datetime.datetime.strptime(
|
out_of_date=datetime.datetime.fromisoformat(dump["flag_date"]) if dump.get("flag_date") else None,
|
||||||
dump["flag_date"],
|
|
||||||
"%Y-%m-%dT%H:%M:%S.%fZ") if dump["flag_date"] is not None else None,
|
|
||||||
maintainer=next(iter(dump["maintainers"]), None),
|
maintainer=next(iter(dump["maintainers"]), None),
|
||||||
submitter=None,
|
submitter=None,
|
||||||
repository=dump["repo"],
|
repository=dump["repo"],
|
||||||
@ -208,9 +206,9 @@ class AURPackage:
|
|||||||
"""
|
"""
|
||||||
identity_mapper: Callable[[Any], Any] = lambda value: value
|
identity_mapper: Callable[[Any], Any] = lambda value: value
|
||||||
value_mapper: dict[str, Callable[[Any], Any]] = {
|
value_mapper: dict[str, Callable[[Any], Any]] = {
|
||||||
"out_of_date": lambda value: datetime.datetime.utcfromtimestamp(value) if value is not None else None,
|
"out_of_date": lambda value: datetime.datetime.fromtimestamp(value, datetime.UTC) if value is not None else None,
|
||||||
"first_submitted": datetime.datetime.utcfromtimestamp,
|
"first_submitted": lambda value: datetime.datetime.fromtimestamp(value, datetime.UTC),
|
||||||
"last_modified": datetime.datetime.utcfromtimestamp,
|
"last_modified": lambda value: datetime.datetime.fromtimestamp(value, datetime.UTC),
|
||||||
}
|
}
|
||||||
|
|
||||||
result: dict[str, Any] = {}
|
result: dict[str, Any] = {}
|
||||||
|
|||||||
@ -18,7 +18,7 @@
|
|||||||
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
#
|
#
|
||||||
from dataclasses import dataclass
|
from dataclasses import dataclass
|
||||||
from typing import Generic, TypeVar
|
from typing import Generic, Self, TypeVar
|
||||||
|
|
||||||
|
|
||||||
T = TypeVar("T")
|
T = TypeVar("T")
|
||||||
@ -35,3 +35,16 @@ class ContextKey(Generic[T]):
|
|||||||
"""
|
"""
|
||||||
key: str
|
key: str
|
||||||
return_type: type[T]
|
return_type: type[T]
|
||||||
|
|
||||||
|
@classmethod
|
||||||
|
def from_type(cls, return_type: type[T]) -> Self:
|
||||||
|
"""
|
||||||
|
construct key from type
|
||||||
|
|
||||||
|
Args:
|
||||||
|
return_type(type[T]): return type used for the specified context key
|
||||||
|
|
||||||
|
Returns:
|
||||||
|
Self: context key with autogenerated
|
||||||
|
"""
|
||||||
|
return cls(return_type.__name__, return_type)
|
||||||
|
|||||||
35
src/ahriman/models/dependencies.py
Normal file
35
src/ahriman/models/dependencies.py
Normal file
@ -0,0 +1,35 @@
|
|||||||
|
#
|
||||||
|
# Copyright (c) 2021-2024 ahriman team.
|
||||||
|
#
|
||||||
|
# This file is part of ahriman
|
||||||
|
# (see https://github.com/arcan1s/ahriman).
|
||||||
|
#
|
||||||
|
# This program is free software: you can redistribute it and/or modify
|
||||||
|
# it under the terms of the GNU General Public License as published by
|
||||||
|
# the Free Software Foundation, either version 3 of the License, or
|
||||||
|
# (at your option) any later version.
|
||||||
|
#
|
||||||
|
# This program is distributed in the hope that it will be useful,
|
||||||
|
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
# GNU General Public License for more details.
|
||||||
|
#
|
||||||
|
# You should have received a copy of the GNU General Public License
|
||||||
|
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
#
|
||||||
|
from dataclasses import dataclass, field
|
||||||
|
from pathlib import Path
|
||||||
|
|
||||||
|
|
||||||
|
@dataclass(frozen=True)
|
||||||
|
class Dependencies:
|
||||||
|
"""
|
||||||
|
package paths dependencies
|
||||||
|
|
||||||
|
Attributes:
|
||||||
|
package_base(str): package base
|
||||||
|
paths(dict[Path, list[str]]): map of the paths used by this package to set of packages in which they were found
|
||||||
|
"""
|
||||||
|
|
||||||
|
package_base: str
|
||||||
|
paths: dict[Path, list[str]] = field(default_factory=dict)
|
||||||
165
src/ahriman/models/package_archive.py
Normal file
165
src/ahriman/models/package_archive.py
Normal file
@ -0,0 +1,165 @@
|
|||||||
|
#
|
||||||
|
# Copyright (c) 2021-2024 ahriman team.
|
||||||
|
#
|
||||||
|
# This file is part of ahriman
|
||||||
|
# (see https://github.com/arcan1s/ahriman).
|
||||||
|
#
|
||||||
|
# This program is free software: you can redistribute it and/or modify
|
||||||
|
# it under the terms of the GNU General Public License as published by
|
||||||
|
# the Free Software Foundation, either version 3 of the License, or
|
||||||
|
# (at your option) any later version.
|
||||||
|
#
|
||||||
|
# This program is distributed in the hope that it will be useful,
|
||||||
|
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
# GNU General Public License for more details.
|
||||||
|
#
|
||||||
|
# You should have received a copy of the GNU General Public License
|
||||||
|
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
#
|
||||||
|
from dataclasses import dataclass
|
||||||
|
from elftools.elf.dynamic import DynamicSection
|
||||||
|
from elftools.elf.elffile import ELFFile
|
||||||
|
from pathlib import Path
|
||||||
|
from typing import IO
|
||||||
|
|
||||||
|
from ahriman.core.util import walk
|
||||||
|
from ahriman.models.dependencies import Dependencies
|
||||||
|
from ahriman.models.package import Package
|
||||||
|
|
||||||
|
|
||||||
|
@dataclass
|
||||||
|
class PackageArchive:
|
||||||
|
"""
|
||||||
|
helper for package archives
|
||||||
|
|
||||||
|
Attributes:
|
||||||
|
package(Package): package descriptor
|
||||||
|
root(Path): path to root filesystem
|
||||||
|
"""
|
||||||
|
|
||||||
|
root: Path
|
||||||
|
package: Package
|
||||||
|
|
||||||
|
@staticmethod
|
||||||
|
def dynamic_needed(binary_path: Path) -> list[str]:
|
||||||
|
"""
|
||||||
|
extract dynamic libraries required by the specified file
|
||||||
|
|
||||||
|
Args:
|
||||||
|
binary_path(Path): path to library, file, etc
|
||||||
|
|
||||||
|
Returns:
|
||||||
|
list[str]: libraries which this file linked dynamically. Returns empty set in case if file is not
|
||||||
|
a binary or no dynamic section has been found
|
||||||
|
"""
|
||||||
|
with binary_path.open("rb") as binary_file:
|
||||||
|
if not PackageArchive.is_elf(binary_file):
|
||||||
|
return []
|
||||||
|
|
||||||
|
elf_file = ELFFile(binary_file) # type: ignore[no-untyped-call]
|
||||||
|
dynamic_section = next(
|
||||||
|
(section for section in elf_file.iter_sections() # type: ignore[no-untyped-call]
|
||||||
|
if isinstance(section, DynamicSection)),
|
||||||
|
None)
|
||||||
|
if dynamic_section is None:
|
||||||
|
return []
|
||||||
|
|
||||||
|
return [
|
||||||
|
tag.needed
|
||||||
|
for tag in dynamic_section.iter_tags() # type: ignore[no-untyped-call]
|
||||||
|
if tag.entry.d_tag == "DT_NEEDED"
|
||||||
|
]
|
||||||
|
|
||||||
|
@staticmethod
|
||||||
|
def is_elf(content: IO[bytes]) -> bool:
|
||||||
|
"""
|
||||||
|
check if the content is actually elf file
|
||||||
|
|
||||||
|
Args:
|
||||||
|
content(IO[bytes]): content of the file
|
||||||
|
|
||||||
|
Returns:
|
||||||
|
bool: True in case if file has elf header and False otherwise
|
||||||
|
"""
|
||||||
|
expected = b"\x7fELF"
|
||||||
|
length = len(expected)
|
||||||
|
|
||||||
|
magic_bytes = content.read(length)
|
||||||
|
content.seek(0) # reset reading position
|
||||||
|
|
||||||
|
return magic_bytes == expected
|
||||||
|
|
||||||
|
def depends_on(self) -> Dependencies:
|
||||||
|
"""
|
||||||
|
extract packages and paths which are required for this package
|
||||||
|
|
||||||
|
Returns:
|
||||||
|
Dependencies: map of the package name to set of paths used by this package
|
||||||
|
"""
|
||||||
|
dependencies, roots = self.depends_on_paths()
|
||||||
|
|
||||||
|
result: dict[Path, list[str]] = {}
|
||||||
|
for package, (directories, files) in self.installed_packages().items():
|
||||||
|
if package in self.package.packages:
|
||||||
|
continue # skip package itself
|
||||||
|
|
||||||
|
required_by = [directory for directory in directories if directory in roots]
|
||||||
|
required_by.extend(library for library in files if library.name in dependencies)
|
||||||
|
|
||||||
|
for path in required_by:
|
||||||
|
result.setdefault(path, []).append(package)
|
||||||
|
|
||||||
|
return Dependencies(self.package.base, result)
|
||||||
|
|
||||||
|
def depends_on_paths(self) -> tuple[set[str], set[Path]]:
|
||||||
|
"""
|
||||||
|
extract dependencies from installation
|
||||||
|
|
||||||
|
Returns:
|
||||||
|
tuple[set[str], set[Path]]: tuple of dynamically linked libraries and directory paths
|
||||||
|
"""
|
||||||
|
dependencies = set()
|
||||||
|
roots: set[Path] = set()
|
||||||
|
|
||||||
|
package_dir = self.root / "build" / self.package.base / "pkg"
|
||||||
|
for path in filter(lambda p: p.is_file(), walk(package_dir)):
|
||||||
|
dependencies.update(PackageArchive.dynamic_needed(path))
|
||||||
|
filesystem_path = Path(*path.relative_to(package_dir).parts[1:])
|
||||||
|
roots.update(filesystem_path.parents[:-1]) # last element is always . because paths are relative
|
||||||
|
|
||||||
|
return dependencies, roots
|
||||||
|
|
||||||
|
def installed_packages(self) -> dict[str, tuple[list[Path], list[Path]]]:
|
||||||
|
"""
|
||||||
|
extract list of the installed packages and their content
|
||||||
|
|
||||||
|
Returns:
|
||||||
|
dict[str, tuple[list[Path], list[Path]]]; map of package name to list of directories and files contained
|
||||||
|
by this package
|
||||||
|
"""
|
||||||
|
result = {}
|
||||||
|
|
||||||
|
pacman_local_files = self.root / "var" / "lib" / "pacman" / "local"
|
||||||
|
for path in filter(lambda fn: fn.name == "files", walk(pacman_local_files)):
|
||||||
|
package, *_ = path.parent.name.rsplit("-", 2)
|
||||||
|
|
||||||
|
directories, files = [], []
|
||||||
|
is_files = False
|
||||||
|
for line in path.read_text(encoding="utf8").splitlines():
|
||||||
|
if not line: # skip empty lines
|
||||||
|
continue
|
||||||
|
if line.startswith("%") and line.endswith("%"): # directive started
|
||||||
|
is_files = line == "%FILES%"
|
||||||
|
if not is_files: # not a files directive
|
||||||
|
continue
|
||||||
|
|
||||||
|
entry = Path(line)
|
||||||
|
if line.endswith("/"): # simple check if it is directory
|
||||||
|
directories.append(entry)
|
||||||
|
else:
|
||||||
|
files.append(entry)
|
||||||
|
|
||||||
|
result[package] = directories, files
|
||||||
|
|
||||||
|
return result
|
||||||
@ -21,9 +21,9 @@ import shlex
|
|||||||
|
|
||||||
from dataclasses import dataclass
|
from dataclasses import dataclass
|
||||||
from pathlib import Path
|
from pathlib import Path
|
||||||
from typing import Any, Self
|
from typing import Any, Generator, Self
|
||||||
|
|
||||||
from ahriman.core.util import dataclass_view, unquote
|
from ahriman.core.util import dataclass_view
|
||||||
|
|
||||||
|
|
||||||
@dataclass(frozen=True)
|
@dataclass(frozen=True)
|
||||||
@ -81,14 +81,57 @@ class PkgbuildPatch:
|
|||||||
Self: package properties
|
Self: package properties
|
||||||
"""
|
"""
|
||||||
key, *value_parts = variable.split("=", maxsplit=1)
|
key, *value_parts = variable.split("=", maxsplit=1)
|
||||||
|
|
||||||
raw_value = next(iter(value_parts), "") # extract raw value
|
raw_value = next(iter(value_parts), "") # extract raw value
|
||||||
if raw_value.startswith("(") and raw_value.endswith(")"):
|
return cls(key, cls.parse(raw_value))
|
||||||
value: str | list[str] = shlex.split(raw_value[1:-1]) # arrays for poor
|
|
||||||
else:
|
|
||||||
value = unquote(raw_value)
|
|
||||||
|
|
||||||
return cls(key, value)
|
@staticmethod
|
||||||
|
def parse(source: str) -> str | list[str]:
|
||||||
|
"""
|
||||||
|
parse string value to the PKGBUILD patch value. This method simply takes string, tries to identify it as array
|
||||||
|
or just string and return the respective value. Functions should be processed correctly, however, not guaranteed
|
||||||
|
|
||||||
|
Args:
|
||||||
|
source(str): source string to parse
|
||||||
|
|
||||||
|
Returns:
|
||||||
|
str | list[str]: parsed value either string or list of strings
|
||||||
|
"""
|
||||||
|
if source.startswith("(") and source.endswith(")"):
|
||||||
|
return shlex.split(source[1:-1]) # arrays for poor
|
||||||
|
return PkgbuildPatch.unquote(source)
|
||||||
|
|
||||||
|
@staticmethod
|
||||||
|
def unquote(source: str) -> str:
|
||||||
|
"""
|
||||||
|
like :func:`shlex.quote()`, but opposite
|
||||||
|
|
||||||
|
Args:
|
||||||
|
source(str): source string to remove quotes
|
||||||
|
|
||||||
|
Returns:
|
||||||
|
str: string with quotes removed
|
||||||
|
|
||||||
|
Raises:
|
||||||
|
ValueError: if no closing quotation
|
||||||
|
"""
|
||||||
|
|
||||||
|
def generator() -> Generator[str, None, None]:
|
||||||
|
token = None
|
||||||
|
for char in source:
|
||||||
|
if token is not None:
|
||||||
|
if char == token:
|
||||||
|
token = None # closed quote
|
||||||
|
else:
|
||||||
|
yield char # character inside quotes
|
||||||
|
elif char in ("'", "\""):
|
||||||
|
token = char # first quote found
|
||||||
|
else:
|
||||||
|
yield char # normal character
|
||||||
|
|
||||||
|
if token is not None:
|
||||||
|
raise ValueError("No closing quotation")
|
||||||
|
|
||||||
|
return "".join(generator())
|
||||||
|
|
||||||
def serialize(self) -> str:
|
def serialize(self) -> str:
|
||||||
"""
|
"""
|
||||||
|
|||||||
@ -24,6 +24,7 @@ from collections.abc import Generator
|
|||||||
from dataclasses import dataclass, field
|
from dataclasses import dataclass, field
|
||||||
from functools import cached_property
|
from functools import cached_property
|
||||||
from pathlib import Path
|
from pathlib import Path
|
||||||
|
from pwd import getpwuid
|
||||||
|
|
||||||
from ahriman.core.exceptions import PathError
|
from ahriman.core.exceptions import PathError
|
||||||
from ahriman.core.log import LazyLogging
|
from ahriman.core.log import LazyLogging
|
||||||
@ -83,6 +84,17 @@ class RepositoryPaths(LazyLogging):
|
|||||||
return Path(self.repository_id.architecture) # legacy tree suffix
|
return Path(self.repository_id.architecture) # legacy tree suffix
|
||||||
return Path(self.repository_id.name) / self.repository_id.architecture
|
return Path(self.repository_id.name) / self.repository_id.architecture
|
||||||
|
|
||||||
|
@property
|
||||||
|
def build_directory(self) -> Path:
|
||||||
|
"""
|
||||||
|
same as :attr:`chroot`, but exactly build chroot
|
||||||
|
|
||||||
|
Returns:
|
||||||
|
Path: path to directory in which build process is run
|
||||||
|
"""
|
||||||
|
uid, _ = self.owner(self.root)
|
||||||
|
return self.chroot / f"{self.repository_id.name}-{self.repository_id.architecture}" / getpwuid(uid).pw_name
|
||||||
|
|
||||||
@property
|
@property
|
||||||
def cache(self) -> Path:
|
def cache(self) -> Path:
|
||||||
"""
|
"""
|
||||||
|
|||||||
19
src/ahriman/web/views/v2/packages/__init__.py
Normal file
19
src/ahriman/web/views/v2/packages/__init__.py
Normal file
@ -0,0 +1,19 @@
|
|||||||
|
#
|
||||||
|
# Copyright (c) 2021-2024 ahriman team.
|
||||||
|
#
|
||||||
|
# This file is part of ahriman
|
||||||
|
# (see https://github.com/arcan1s/ahriman).
|
||||||
|
#
|
||||||
|
# This program is free software: you can redistribute it and/or modify
|
||||||
|
# it under the terms of the GNU General Public License as published by
|
||||||
|
# the Free Software Foundation, either version 3 of the License, or
|
||||||
|
# (at your option) any later version.
|
||||||
|
#
|
||||||
|
# This program is distributed in the hope that it will be useful,
|
||||||
|
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
# GNU General Public License for more details.
|
||||||
|
#
|
||||||
|
# You should have received a copy of the GNU General Public License
|
||||||
|
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
#
|
||||||
@ -131,25 +131,6 @@ def test_sign_skip(application_repository: ApplicationRepository, package_ahrima
|
|||||||
application_repository.sign([])
|
application_repository.sign([])
|
||||||
|
|
||||||
|
|
||||||
def test_sign_specific(application_repository: ApplicationRepository, package_ahriman: Package,
|
|
||||||
package_python_schedule: Package, mocker: MockerFixture) -> None:
|
|
||||||
"""
|
|
||||||
must sign only specified packages
|
|
||||||
"""
|
|
||||||
mocker.patch("ahriman.core.repository.repository.Repository.packages",
|
|
||||||
return_value=[package_ahriman, package_python_schedule])
|
|
||||||
sign_package_mock = mocker.patch("ahriman.core.sign.gpg.GPG.process_sign_package")
|
|
||||||
sign_repository_mock = mocker.patch("ahriman.core.sign.gpg.GPG.process_sign_repository")
|
|
||||||
on_result_mock = mocker.patch(
|
|
||||||
"ahriman.application.application.application_repository.ApplicationRepository.on_result")
|
|
||||||
|
|
||||||
filename = package_ahriman.packages[package_ahriman.base].filepath
|
|
||||||
application_repository.sign([package_ahriman.base])
|
|
||||||
sign_package_mock.assert_called_once_with(filename, None)
|
|
||||||
sign_repository_mock.assert_called_once_with(application_repository.repository.repo.repo_path)
|
|
||||||
on_result_mock.assert_called_once_with(Result())
|
|
||||||
|
|
||||||
|
|
||||||
def test_unknown_no_aur(application_repository: ApplicationRepository, package_ahriman: Package,
|
def test_unknown_no_aur(application_repository: ApplicationRepository, package_ahriman: Package,
|
||||||
mocker: MockerFixture) -> None:
|
mocker: MockerFixture) -> None:
|
||||||
"""
|
"""
|
||||||
@ -239,11 +220,13 @@ def test_updates_all(application_repository: ApplicationRepository, package_ahri
|
|||||||
return_value=[package_ahriman])
|
return_value=[package_ahriman])
|
||||||
updates_local_mock = mocker.patch("ahriman.core.repository.update_handler.UpdateHandler.updates_local")
|
updates_local_mock = mocker.patch("ahriman.core.repository.update_handler.UpdateHandler.updates_local")
|
||||||
updates_manual_mock = mocker.patch("ahriman.core.repository.update_handler.UpdateHandler.updates_manual")
|
updates_manual_mock = mocker.patch("ahriman.core.repository.update_handler.UpdateHandler.updates_manual")
|
||||||
|
updates_deps_mock = mocker.patch("ahriman.core.repository.update_handler.UpdateHandler.updates_dependencies")
|
||||||
|
|
||||||
application_repository.updates([], aur=True, local=True, manual=True, vcs=True)
|
application_repository.updates([], aur=True, local=True, manual=True, vcs=True, check_files=True)
|
||||||
updates_aur_mock.assert_called_once_with([], vcs=True)
|
updates_aur_mock.assert_called_once_with([], vcs=True)
|
||||||
updates_local_mock.assert_called_once_with(vcs=True)
|
updates_local_mock.assert_called_once_with(vcs=True)
|
||||||
updates_manual_mock.assert_called_once_with()
|
updates_manual_mock.assert_called_once_with()
|
||||||
|
updates_deps_mock.assert_called_once_with([])
|
||||||
|
|
||||||
|
|
||||||
def test_updates_disabled(application_repository: ApplicationRepository, mocker: MockerFixture) -> None:
|
def test_updates_disabled(application_repository: ApplicationRepository, mocker: MockerFixture) -> None:
|
||||||
@ -253,11 +236,13 @@ def test_updates_disabled(application_repository: ApplicationRepository, mocker:
|
|||||||
updates_aur_mock = mocker.patch("ahriman.core.repository.update_handler.UpdateHandler.updates_aur")
|
updates_aur_mock = mocker.patch("ahriman.core.repository.update_handler.UpdateHandler.updates_aur")
|
||||||
updates_local_mock = mocker.patch("ahriman.core.repository.update_handler.UpdateHandler.updates_local")
|
updates_local_mock = mocker.patch("ahriman.core.repository.update_handler.UpdateHandler.updates_local")
|
||||||
updates_manual_mock = mocker.patch("ahriman.core.repository.update_handler.UpdateHandler.updates_manual")
|
updates_manual_mock = mocker.patch("ahriman.core.repository.update_handler.UpdateHandler.updates_manual")
|
||||||
|
updates_deps_mock = mocker.patch("ahriman.core.repository.update_handler.UpdateHandler.updates_dependencies")
|
||||||
|
|
||||||
application_repository.updates([], aur=False, local=False, manual=False, vcs=True)
|
application_repository.updates([], aur=False, local=False, manual=False, vcs=True, check_files=False)
|
||||||
updates_aur_mock.assert_not_called()
|
updates_aur_mock.assert_not_called()
|
||||||
updates_local_mock.assert_not_called()
|
updates_local_mock.assert_not_called()
|
||||||
updates_manual_mock.assert_not_called()
|
updates_manual_mock.assert_not_called()
|
||||||
|
updates_deps_mock.assert_not_called()
|
||||||
|
|
||||||
|
|
||||||
def test_updates_no_aur(application_repository: ApplicationRepository, mocker: MockerFixture) -> None:
|
def test_updates_no_aur(application_repository: ApplicationRepository, mocker: MockerFixture) -> None:
|
||||||
@ -267,11 +252,13 @@ def test_updates_no_aur(application_repository: ApplicationRepository, mocker: M
|
|||||||
updates_aur_mock = mocker.patch("ahriman.core.repository.update_handler.UpdateHandler.updates_aur")
|
updates_aur_mock = mocker.patch("ahriman.core.repository.update_handler.UpdateHandler.updates_aur")
|
||||||
updates_local_mock = mocker.patch("ahriman.core.repository.update_handler.UpdateHandler.updates_local")
|
updates_local_mock = mocker.patch("ahriman.core.repository.update_handler.UpdateHandler.updates_local")
|
||||||
updates_manual_mock = mocker.patch("ahriman.core.repository.update_handler.UpdateHandler.updates_manual")
|
updates_manual_mock = mocker.patch("ahriman.core.repository.update_handler.UpdateHandler.updates_manual")
|
||||||
|
updates_deps_mock = mocker.patch("ahriman.core.repository.update_handler.UpdateHandler.updates_dependencies")
|
||||||
|
|
||||||
application_repository.updates([], aur=False, local=True, manual=True, vcs=True)
|
application_repository.updates([], aur=False, local=True, manual=True, vcs=True, check_files=True)
|
||||||
updates_aur_mock.assert_not_called()
|
updates_aur_mock.assert_not_called()
|
||||||
updates_local_mock.assert_called_once_with(vcs=True)
|
updates_local_mock.assert_called_once_with(vcs=True)
|
||||||
updates_manual_mock.assert_called_once_with()
|
updates_manual_mock.assert_called_once_with()
|
||||||
|
updates_deps_mock.assert_called_once_with([])
|
||||||
|
|
||||||
|
|
||||||
def test_updates_no_local(application_repository: ApplicationRepository, mocker: MockerFixture) -> None:
|
def test_updates_no_local(application_repository: ApplicationRepository, mocker: MockerFixture) -> None:
|
||||||
@ -281,11 +268,13 @@ def test_updates_no_local(application_repository: ApplicationRepository, mocker:
|
|||||||
updates_aur_mock = mocker.patch("ahriman.core.repository.update_handler.UpdateHandler.updates_aur")
|
updates_aur_mock = mocker.patch("ahriman.core.repository.update_handler.UpdateHandler.updates_aur")
|
||||||
updates_local_mock = mocker.patch("ahriman.core.repository.update_handler.UpdateHandler.updates_local")
|
updates_local_mock = mocker.patch("ahriman.core.repository.update_handler.UpdateHandler.updates_local")
|
||||||
updates_manual_mock = mocker.patch("ahriman.core.repository.update_handler.UpdateHandler.updates_manual")
|
updates_manual_mock = mocker.patch("ahriman.core.repository.update_handler.UpdateHandler.updates_manual")
|
||||||
|
updates_deps_mock = mocker.patch("ahriman.core.repository.update_handler.UpdateHandler.updates_dependencies")
|
||||||
|
|
||||||
application_repository.updates([], aur=True, local=False, manual=True, vcs=True)
|
application_repository.updates([], aur=True, local=False, manual=True, vcs=True, check_files=True)
|
||||||
updates_aur_mock.assert_called_once_with([], vcs=True)
|
updates_aur_mock.assert_called_once_with([], vcs=True)
|
||||||
updates_local_mock.assert_not_called()
|
updates_local_mock.assert_not_called()
|
||||||
updates_manual_mock.assert_called_once_with()
|
updates_manual_mock.assert_called_once_with()
|
||||||
|
updates_deps_mock.assert_called_once_with([])
|
||||||
|
|
||||||
|
|
||||||
def test_updates_no_manual(application_repository: ApplicationRepository, mocker: MockerFixture) -> None:
|
def test_updates_no_manual(application_repository: ApplicationRepository, mocker: MockerFixture) -> None:
|
||||||
@ -295,11 +284,13 @@ def test_updates_no_manual(application_repository: ApplicationRepository, mocker
|
|||||||
updates_aur_mock = mocker.patch("ahriman.core.repository.update_handler.UpdateHandler.updates_aur")
|
updates_aur_mock = mocker.patch("ahriman.core.repository.update_handler.UpdateHandler.updates_aur")
|
||||||
updates_local_mock = mocker.patch("ahriman.core.repository.update_handler.UpdateHandler.updates_local")
|
updates_local_mock = mocker.patch("ahriman.core.repository.update_handler.UpdateHandler.updates_local")
|
||||||
updates_manual_mock = mocker.patch("ahriman.core.repository.update_handler.UpdateHandler.updates_manual")
|
updates_manual_mock = mocker.patch("ahriman.core.repository.update_handler.UpdateHandler.updates_manual")
|
||||||
|
updates_deps_mock = mocker.patch("ahriman.core.repository.update_handler.UpdateHandler.updates_dependencies")
|
||||||
|
|
||||||
application_repository.updates([], aur=True, local=True, manual=False, vcs=True)
|
application_repository.updates([], aur=True, local=True, manual=False, vcs=True, check_files=True)
|
||||||
updates_aur_mock.assert_called_once_with([], vcs=True)
|
updates_aur_mock.assert_called_once_with([], vcs=True)
|
||||||
updates_local_mock.assert_called_once_with(vcs=True)
|
updates_local_mock.assert_called_once_with(vcs=True)
|
||||||
updates_manual_mock.assert_not_called()
|
updates_manual_mock.assert_not_called()
|
||||||
|
updates_deps_mock.assert_called_once_with([])
|
||||||
|
|
||||||
|
|
||||||
def test_updates_no_vcs(application_repository: ApplicationRepository, mocker: MockerFixture) -> None:
|
def test_updates_no_vcs(application_repository: ApplicationRepository, mocker: MockerFixture) -> None:
|
||||||
@ -309,11 +300,29 @@ def test_updates_no_vcs(application_repository: ApplicationRepository, mocker: M
|
|||||||
updates_aur_mock = mocker.patch("ahriman.core.repository.update_handler.UpdateHandler.updates_aur")
|
updates_aur_mock = mocker.patch("ahriman.core.repository.update_handler.UpdateHandler.updates_aur")
|
||||||
updates_local_mock = mocker.patch("ahriman.core.repository.update_handler.UpdateHandler.updates_local")
|
updates_local_mock = mocker.patch("ahriman.core.repository.update_handler.UpdateHandler.updates_local")
|
||||||
updates_manual_mock = mocker.patch("ahriman.core.repository.update_handler.UpdateHandler.updates_manual")
|
updates_manual_mock = mocker.patch("ahriman.core.repository.update_handler.UpdateHandler.updates_manual")
|
||||||
|
updates_deps_mock = mocker.patch("ahriman.core.repository.update_handler.UpdateHandler.updates_dependencies")
|
||||||
|
|
||||||
application_repository.updates([], aur=True, local=True, manual=True, vcs=False)
|
application_repository.updates([], aur=True, local=True, manual=True, vcs=False, check_files=True)
|
||||||
updates_aur_mock.assert_called_once_with([], vcs=False)
|
updates_aur_mock.assert_called_once_with([], vcs=False)
|
||||||
updates_local_mock.assert_called_once_with(vcs=False)
|
updates_local_mock.assert_called_once_with(vcs=False)
|
||||||
updates_manual_mock.assert_called_once_with()
|
updates_manual_mock.assert_called_once_with()
|
||||||
|
updates_deps_mock.assert_called_once_with([])
|
||||||
|
|
||||||
|
|
||||||
|
def test_updates_no_check_files(application_repository: ApplicationRepository, mocker: MockerFixture) -> None:
|
||||||
|
"""
|
||||||
|
must get updates without checking broken links
|
||||||
|
"""
|
||||||
|
updates_aur_mock = mocker.patch("ahriman.core.repository.update_handler.UpdateHandler.updates_aur")
|
||||||
|
updates_local_mock = mocker.patch("ahriman.core.repository.update_handler.UpdateHandler.updates_local")
|
||||||
|
updates_manual_mock = mocker.patch("ahriman.core.repository.update_handler.UpdateHandler.updates_manual")
|
||||||
|
updates_deps_mock = mocker.patch("ahriman.core.repository.update_handler.UpdateHandler.updates_dependencies")
|
||||||
|
|
||||||
|
application_repository.updates([], aur=True, local=True, manual=True, vcs=True, check_files=False)
|
||||||
|
updates_aur_mock.assert_called_once_with([], vcs=True)
|
||||||
|
updates_local_mock.assert_called_once_with(vcs=True)
|
||||||
|
updates_manual_mock.assert_called_once_with()
|
||||||
|
updates_deps_mock.assert_not_called()
|
||||||
|
|
||||||
|
|
||||||
def test_updates_with_filter(application_repository: ApplicationRepository, mocker: MockerFixture) -> None:
|
def test_updates_with_filter(application_repository: ApplicationRepository, mocker: MockerFixture) -> None:
|
||||||
@ -323,8 +332,10 @@ def test_updates_with_filter(application_repository: ApplicationRepository, mock
|
|||||||
updates_aur_mock = mocker.patch("ahriman.core.repository.update_handler.UpdateHandler.updates_aur")
|
updates_aur_mock = mocker.patch("ahriman.core.repository.update_handler.UpdateHandler.updates_aur")
|
||||||
updates_local_mock = mocker.patch("ahriman.core.repository.update_handler.UpdateHandler.updates_local")
|
updates_local_mock = mocker.patch("ahriman.core.repository.update_handler.UpdateHandler.updates_local")
|
||||||
updates_manual_mock = mocker.patch("ahriman.core.repository.update_handler.UpdateHandler.updates_manual")
|
updates_manual_mock = mocker.patch("ahriman.core.repository.update_handler.UpdateHandler.updates_manual")
|
||||||
|
updates_deps_mock = mocker.patch("ahriman.core.repository.update_handler.UpdateHandler.updates_dependencies")
|
||||||
|
|
||||||
application_repository.updates(["filter"], aur=True, local=True, manual=True, vcs=True)
|
application_repository.updates(["filter"], aur=True, local=True, manual=True, vcs=True, check_files=True)
|
||||||
updates_aur_mock.assert_called_once_with(["filter"], vcs=True)
|
updates_aur_mock.assert_called_once_with(["filter"], vcs=True)
|
||||||
updates_local_mock.assert_called_once_with(vcs=True)
|
updates_local_mock.assert_called_once_with(vcs=True)
|
||||||
updates_manual_mock.assert_called_once_with()
|
updates_manual_mock.assert_called_once_with()
|
||||||
|
updates_deps_mock.assert_called_once_with(["filter"])
|
||||||
|
|||||||
@ -89,7 +89,8 @@ def test_run_with_updates(args: argparse.Namespace, configuration: Configuration
|
|||||||
|
|
||||||
_, repository_id = configuration.check_loaded()
|
_, repository_id = configuration.check_loaded()
|
||||||
Add.run(args, repository_id, configuration, report=False)
|
Add.run(args, repository_id, configuration, report=False)
|
||||||
updates_mock.assert_called_once_with(args.package, aur=False, local=False, manual=True, vcs=False)
|
updates_mock.assert_called_once_with(args.package,
|
||||||
|
aur=False, local=False, manual=True, vcs=False, check_files=False)
|
||||||
application_mock.assert_called_once_with([package_ahriman],
|
application_mock.assert_called_once_with([package_ahriman],
|
||||||
Packagers(args.username, {package_ahriman.base: "packager"}),
|
Packagers(args.username, {package_ahriman.base: "packager"}),
|
||||||
bump_pkgrel=args.increment)
|
bump_pkgrel=args.increment)
|
||||||
|
|||||||
@ -31,7 +31,7 @@ def test_run(args: argparse.Namespace, configuration: Configuration, mocker: Moc
|
|||||||
mocker.patch("ahriman.application.handlers.Backup.get_paths", return_value=[Path("path")])
|
mocker.patch("ahriman.application.handlers.Backup.get_paths", return_value=[Path("path")])
|
||||||
tarfile = MagicMock()
|
tarfile = MagicMock()
|
||||||
add_mock = tarfile.__enter__.return_value = MagicMock()
|
add_mock = tarfile.__enter__.return_value = MagicMock()
|
||||||
mocker.patch("tarfile.TarFile.__new__", return_value=tarfile)
|
mocker.patch("ahriman.application.handlers.backup.tarfile.open", return_value=tarfile)
|
||||||
|
|
||||||
_, repository_id = configuration.check_loaded()
|
_, repository_id = configuration.check_loaded()
|
||||||
Backup.run(args, repository_id, configuration, report=False)
|
Backup.run(args, repository_id, configuration, report=False)
|
||||||
@ -45,7 +45,7 @@ def test_get_paths(configuration: Configuration, mocker: MockerFixture) -> None:
|
|||||||
# gnupg export mock
|
# gnupg export mock
|
||||||
mocker.patch("pathlib.Path.is_dir", return_value=True)
|
mocker.patch("pathlib.Path.is_dir", return_value=True)
|
||||||
mocker.patch.object(RepositoryPaths, "root_owner", (42, 42))
|
mocker.patch.object(RepositoryPaths, "root_owner", (42, 42))
|
||||||
getpwuid_mock = mocker.patch("pwd.getpwuid", return_value=MagicMock())
|
getpwuid_mock = mocker.patch("ahriman.application.handlers.backup.getpwuid", return_value=MagicMock())
|
||||||
# well database does not exist so we override it
|
# well database does not exist so we override it
|
||||||
database_mock = mocker.patch("ahriman.core.database.SQLite.database_path", return_value=configuration.path)
|
database_mock = mocker.patch("ahriman.core.database.SQLite.database_path", return_value=configuration.path)
|
||||||
|
|
||||||
|
|||||||
@ -122,11 +122,10 @@ def test_patch_create_from_function(mocker: MockerFixture) -> None:
|
|||||||
"""
|
"""
|
||||||
must create function patch from file
|
must create function patch from file
|
||||||
"""
|
"""
|
||||||
path = Path("local")
|
|
||||||
patch = PkgbuildPatch("version", "patch")
|
patch = PkgbuildPatch("version", "patch")
|
||||||
read_mock = mocker.patch("pathlib.Path.read_text", return_value=patch.value)
|
read_mock = mocker.patch("pathlib.Path.read_text", return_value=patch.value)
|
||||||
|
|
||||||
assert Patch.patch_create_from_function(patch.key, path) == patch
|
assert Patch.patch_create_from_function(patch.key, Path("local")) == patch
|
||||||
read_mock.assert_called_once_with(encoding="utf8")
|
read_mock.assert_called_once_with(encoding="utf8")
|
||||||
|
|
||||||
|
|
||||||
@ -148,6 +147,15 @@ def test_patch_create_from_function_strip(mocker: MockerFixture) -> None:
|
|||||||
assert Patch.patch_create_from_function(patch.key, None) == patch
|
assert Patch.patch_create_from_function(patch.key, None) == patch
|
||||||
|
|
||||||
|
|
||||||
|
def test_patch_create_from_function_array(mocker: MockerFixture) -> None:
|
||||||
|
"""
|
||||||
|
must correctly read array variable
|
||||||
|
"""
|
||||||
|
patch = PkgbuildPatch("version", ["array", "patch"])
|
||||||
|
mocker.patch("pathlib.Path.read_text", return_value=f"({" ".join(patch.value)})")
|
||||||
|
assert Patch.patch_create_from_function(patch.key, Path("local")) == patch
|
||||||
|
|
||||||
|
|
||||||
def test_patch_set_list(application: Application, mocker: MockerFixture) -> None:
|
def test_patch_set_list(application: Application, mocker: MockerFixture) -> None:
|
||||||
"""
|
"""
|
||||||
must list available patches for the command
|
must list available patches for the command
|
||||||
|
|||||||
@ -30,7 +30,7 @@ def test_run(args: argparse.Namespace, configuration: Configuration, mocker: Moc
|
|||||||
args = _default_args(args)
|
args = _default_args(args)
|
||||||
tarfile = MagicMock()
|
tarfile = MagicMock()
|
||||||
extract_mock = tarfile.__enter__.return_value = MagicMock()
|
extract_mock = tarfile.__enter__.return_value = MagicMock()
|
||||||
mocker.patch("tarfile.TarFile.__new__", return_value=tarfile)
|
mocker.patch("ahriman.application.handlers.restore.tarfile.open", return_value=tarfile)
|
||||||
|
|
||||||
_, repository_id = configuration.check_loaded()
|
_, repository_id = configuration.check_loaded()
|
||||||
Restore.run(args, repository_id, configuration, report=False)
|
Restore.run(args, repository_id, configuration, report=False)
|
||||||
|
|||||||
@ -25,6 +25,7 @@ def _default_args(args: argparse.Namespace) -> argparse.Namespace:
|
|||||||
"""
|
"""
|
||||||
args.aur = True
|
args.aur = True
|
||||||
args.changes = True
|
args.changes = True
|
||||||
|
args.check_files = True
|
||||||
args.package = []
|
args.package = []
|
||||||
args.dependencies = True
|
args.dependencies = True
|
||||||
args.dry_run = False
|
args.dry_run = False
|
||||||
@ -61,7 +62,8 @@ def test_run(args: argparse.Namespace, package_ahriman: Package, configuration:
|
|||||||
application_mock.assert_called_once_with([package_ahriman],
|
application_mock.assert_called_once_with([package_ahriman],
|
||||||
Packagers(args.username, {package_ahriman.base: "packager"}),
|
Packagers(args.username, {package_ahriman.base: "packager"}),
|
||||||
bump_pkgrel=args.increment)
|
bump_pkgrel=args.increment)
|
||||||
updates_mock.assert_called_once_with(args.package, aur=args.aur, local=args.local, manual=args.manual, vcs=args.vcs)
|
updates_mock.assert_called_once_with(
|
||||||
|
args.package, aur=args.aur, local=args.local, manual=args.manual, vcs=args.vcs, check_files=args.check_files)
|
||||||
changes_mock.assert_not_called()
|
changes_mock.assert_not_called()
|
||||||
dependencies_mock.assert_called_once_with([package_ahriman], process_dependencies=args.dependencies)
|
dependencies_mock.assert_called_once_with([package_ahriman], process_dependencies=args.dependencies)
|
||||||
check_mock.assert_called_once_with(False, False)
|
check_mock.assert_called_once_with(False, False)
|
||||||
@ -122,7 +124,8 @@ def test_run_dry_run(args: argparse.Namespace, package_ahriman: Package, configu
|
|||||||
|
|
||||||
_, repository_id = configuration.check_loaded()
|
_, repository_id = configuration.check_loaded()
|
||||||
Update.run(args, repository_id, configuration, report=False)
|
Update.run(args, repository_id, configuration, report=False)
|
||||||
updates_mock.assert_called_once_with(args.package, aur=args.aur, local=args.local, manual=args.manual, vcs=args.vcs)
|
updates_mock.assert_called_once_with(
|
||||||
|
args.package, aur=args.aur, local=args.local, manual=args.manual, vcs=args.vcs, check_files=args.check_files)
|
||||||
application_mock.assert_not_called()
|
application_mock.assert_not_called()
|
||||||
changes_mock.assert_called_once_with([package_ahriman])
|
changes_mock.assert_called_once_with([package_ahriman])
|
||||||
check_mock.assert_called_once_with(False, pytest.helpers.anyvar(int))
|
check_mock.assert_called_once_with(False, pytest.helpers.anyvar(int))
|
||||||
|
|||||||
@ -133,8 +133,8 @@ def aur_package_ahriman() -> AURPackage:
|
|||||||
description="ArcH linux ReposItory MANager",
|
description="ArcH linux ReposItory MANager",
|
||||||
num_votes=0,
|
num_votes=0,
|
||||||
popularity=0,
|
popularity=0,
|
||||||
first_submitted=datetime.datetime.utcfromtimestamp(1618008285),
|
first_submitted=datetime.datetime.fromtimestamp(1618008285, datetime.UTC),
|
||||||
last_modified=datetime.datetime.utcfromtimestamp(1673826351),
|
last_modified=datetime.datetime.fromtimestamp(1673826351, datetime.UTC),
|
||||||
url_path="/cgit/aur.git/snapshot/ahriman.tar.gz",
|
url_path="/cgit/aur.git/snapshot/ahriman.tar.gz",
|
||||||
url="https://github.com/arcan1s/ahriman",
|
url="https://github.com/arcan1s/ahriman",
|
||||||
out_of_date=None,
|
out_of_date=None,
|
||||||
@ -200,8 +200,8 @@ def aur_package_akonadi() -> AURPackage:
|
|||||||
description="PIM layer, which provides an asynchronous API to access all kind of PIM data",
|
description="PIM layer, which provides an asynchronous API to access all kind of PIM data",
|
||||||
num_votes=0,
|
num_votes=0,
|
||||||
popularity=0.0,
|
popularity=0.0,
|
||||||
first_submitted=datetime.datetime.utcfromtimestamp(0),
|
first_submitted=datetime.datetime.fromtimestamp(0, datetime.UTC),
|
||||||
last_modified=datetime.datetime.utcfromtimestamp(1646555990.610),
|
last_modified=datetime.datetime.fromtimestamp(1646555990.610, datetime.UTC),
|
||||||
url_path="",
|
url_path="",
|
||||||
url="https://kontact.kde.org",
|
url="https://kontact.kde.org",
|
||||||
out_of_date=None,
|
out_of_date=None,
|
||||||
@ -451,6 +451,7 @@ def passwd() -> MagicMock:
|
|||||||
"""
|
"""
|
||||||
passwd = MagicMock()
|
passwd = MagicMock()
|
||||||
passwd.pw_dir = "home"
|
passwd.pw_dir = "home"
|
||||||
|
passwd.pw_name = "ahriman"
|
||||||
return passwd
|
return passwd
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
21
tests/ahriman/core/alpm/conftest.py
Normal file
21
tests/ahriman/core/alpm/conftest.py
Normal file
@ -0,0 +1,21 @@
|
|||||||
|
import pytest
|
||||||
|
|
||||||
|
from ahriman.core.alpm.pacman_database import PacmanDatabase
|
||||||
|
from ahriman.core.alpm.pacman import Pacman
|
||||||
|
from ahriman.core.configuration import Configuration
|
||||||
|
|
||||||
|
|
||||||
|
@pytest.fixture
|
||||||
|
def pacman_database(configuration: Configuration, pacman: Pacman) -> PacmanDatabase:
|
||||||
|
"""
|
||||||
|
database sync fixture
|
||||||
|
|
||||||
|
Args:
|
||||||
|
configuration(Configuration): configuration test instance
|
||||||
|
pacman(Pacman): pacman test instance
|
||||||
|
|
||||||
|
Returns:
|
||||||
|
DatabaseSync: database sync test instance
|
||||||
|
"""
|
||||||
|
database = next(iter(pacman.handle.get_syncdbs()))
|
||||||
|
return PacmanDatabase(database, configuration)
|
||||||
@ -14,7 +14,7 @@ def test_package_info(official_syncdb: OfficialSyncdb, aur_package_akonadi: AURP
|
|||||||
must return package info from the database
|
must return package info from the database
|
||||||
"""
|
"""
|
||||||
mocker.patch("ahriman.models.aur_package.AURPackage.from_pacman", return_value=aur_package_akonadi)
|
mocker.patch("ahriman.models.aur_package.AURPackage.from_pacman", return_value=aur_package_akonadi)
|
||||||
get_mock = mocker.patch("ahriman.core.alpm.pacman.Pacman.package_get", return_value=[aur_package_akonadi])
|
get_mock = mocker.patch("ahriman.core.alpm.pacman.Pacman.package", return_value=[aur_package_akonadi])
|
||||||
|
|
||||||
package = official_syncdb.package_info(aur_package_akonadi.name, pacman=pacman)
|
package = official_syncdb.package_info(aur_package_akonadi.name, pacman=pacman)
|
||||||
get_mock.assert_called_once_with(aur_package_akonadi.name)
|
get_mock.assert_called_once_with(aur_package_akonadi.name)
|
||||||
@ -26,7 +26,7 @@ def test_package_info_no_pacman(official_syncdb: OfficialSyncdb, aur_package_ako
|
|||||||
"""
|
"""
|
||||||
must raise UnknownPackageError if no pacman set
|
must raise UnknownPackageError if no pacman set
|
||||||
"""
|
"""
|
||||||
mocker.patch("ahriman.core.alpm.pacman.Pacman.package_get", return_value=[aur_package_akonadi])
|
mocker.patch("ahriman.core.alpm.pacman.Pacman.package", return_value=[aur_package_akonadi])
|
||||||
|
|
||||||
with pytest.raises(UnknownPackageError, match=aur_package_akonadi.name):
|
with pytest.raises(UnknownPackageError, match=aur_package_akonadi.name):
|
||||||
official_syncdb.package_info(aur_package_akonadi.name, pacman=None)
|
official_syncdb.package_info(aur_package_akonadi.name, pacman=None)
|
||||||
@ -37,6 +37,6 @@ def test_package_info_not_found(official_syncdb: OfficialSyncdb, aur_package_ako
|
|||||||
"""
|
"""
|
||||||
must raise UnknownPackage exception in case if no package was found
|
must raise UnknownPackage exception in case if no package was found
|
||||||
"""
|
"""
|
||||||
mocker.patch("ahriman.core.alpm.pacman.Pacman.package_get", return_value=[])
|
mocker.patch("ahriman.core.alpm.pacman.Pacman.package", return_value=[])
|
||||||
with pytest.raises(UnknownPackageError, match=aur_package_akonadi.name):
|
with pytest.raises(UnknownPackageError, match=aur_package_akonadi.name):
|
||||||
assert official_syncdb.package_info(aur_package_akonadi.name, pacman=pacman)
|
assert official_syncdb.package_info(aur_package_akonadi.name, pacman=pacman)
|
||||||
|
|||||||
@ -1,13 +1,14 @@
|
|||||||
import pytest
|
import pytest
|
||||||
|
import tarfile
|
||||||
|
|
||||||
from pathlib import Path
|
from pathlib import Path
|
||||||
from pyalpm import error as PyalpmError
|
|
||||||
from pytest_mock import MockerFixture
|
from pytest_mock import MockerFixture
|
||||||
from tempfile import TemporaryDirectory
|
from tempfile import TemporaryDirectory
|
||||||
from unittest.mock import MagicMock
|
from unittest.mock import MagicMock, call as MockCall
|
||||||
|
|
||||||
from ahriman.core.alpm.pacman import Pacman
|
from ahriman.core.alpm.pacman import Pacman
|
||||||
from ahriman.core.configuration import Configuration
|
from ahriman.core.configuration import Configuration
|
||||||
|
from ahriman.models.package import Package
|
||||||
from ahriman.models.pacman_synchronization import PacmanSynchronization
|
from ahriman.models.pacman_synchronization import PacmanSynchronization
|
||||||
from ahriman.models.repository_paths import RepositoryPaths
|
from ahriman.models.repository_paths import RepositoryPaths
|
||||||
|
|
||||||
@ -48,7 +49,7 @@ def test_init_with_local_cache_forced(configuration: Configuration, mocker: Mock
|
|||||||
sync_mock.assert_called_once_with(pytest.helpers.anyvar(int), force=True)
|
sync_mock.assert_called_once_with(pytest.helpers.anyvar(int), force=True)
|
||||||
|
|
||||||
|
|
||||||
def test_database_copy(pacman: Pacman, repository_paths: RepositoryPaths, mocker: MockerFixture) -> None:
|
def test_database_copy(pacman: Pacman, mocker: MockerFixture) -> None:
|
||||||
"""
|
"""
|
||||||
must copy database from root
|
must copy database from root
|
||||||
"""
|
"""
|
||||||
@ -62,13 +63,13 @@ def test_database_copy(pacman: Pacman, repository_paths: RepositoryPaths, mocker
|
|||||||
copy_mock = mocker.patch("shutil.copy")
|
copy_mock = mocker.patch("shutil.copy")
|
||||||
chown_mock = mocker.patch("ahriman.models.repository_paths.RepositoryPaths.chown")
|
chown_mock = mocker.patch("ahriman.models.repository_paths.RepositoryPaths.chown")
|
||||||
|
|
||||||
pacman.database_copy(pacman.handle, database, path, repository_paths, use_ahriman_cache=True)
|
pacman.database_copy(pacman.handle, database, path, use_ahriman_cache=True)
|
||||||
mkdir_mock.assert_called_once_with(mode=0o755, exist_ok=True)
|
mkdir_mock.assert_called_once_with(mode=0o755, exist_ok=True)
|
||||||
copy_mock.assert_called_once_with(path / "sync" / "core.db", dst_path)
|
copy_mock.assert_called_once_with(path / "sync" / "core.db", dst_path)
|
||||||
chown_mock.assert_called_once_with(dst_path)
|
chown_mock.assert_called_once_with(dst_path)
|
||||||
|
|
||||||
|
|
||||||
def test_database_copy_skip(pacman: Pacman, repository_paths: RepositoryPaths, mocker: MockerFixture) -> None:
|
def test_database_copy_skip(pacman: Pacman, mocker: MockerFixture) -> None:
|
||||||
"""
|
"""
|
||||||
must do not copy database from root if local cache is disabled
|
must do not copy database from root if local cache is disabled
|
||||||
"""
|
"""
|
||||||
@ -79,11 +80,11 @@ def test_database_copy_skip(pacman: Pacman, repository_paths: RepositoryPaths, m
|
|||||||
mocker.patch("pathlib.Path.is_file", autospec=True, side_effect=lambda p: p.is_relative_to(path))
|
mocker.patch("pathlib.Path.is_file", autospec=True, side_effect=lambda p: p.is_relative_to(path))
|
||||||
copy_mock = mocker.patch("shutil.copy")
|
copy_mock = mocker.patch("shutil.copy")
|
||||||
|
|
||||||
pacman.database_copy(pacman.handle, database, path, repository_paths, use_ahriman_cache=False)
|
pacman.database_copy(pacman.handle, database, path, use_ahriman_cache=False)
|
||||||
copy_mock.assert_not_called()
|
copy_mock.assert_not_called()
|
||||||
|
|
||||||
|
|
||||||
def test_database_copy_no_directory(pacman: Pacman, repository_paths: RepositoryPaths, mocker: MockerFixture) -> None:
|
def test_database_copy_no_directory(pacman: Pacman, mocker: MockerFixture) -> None:
|
||||||
"""
|
"""
|
||||||
must do not copy database if local cache already exists
|
must do not copy database if local cache already exists
|
||||||
"""
|
"""
|
||||||
@ -94,11 +95,11 @@ def test_database_copy_no_directory(pacman: Pacman, repository_paths: Repository
|
|||||||
mocker.patch("pathlib.Path.is_file", autospec=True, side_effect=lambda p: p.is_relative_to(path))
|
mocker.patch("pathlib.Path.is_file", autospec=True, side_effect=lambda p: p.is_relative_to(path))
|
||||||
copy_mock = mocker.patch("shutil.copy")
|
copy_mock = mocker.patch("shutil.copy")
|
||||||
|
|
||||||
pacman.database_copy(pacman.handle, database, path, repository_paths, use_ahriman_cache=True)
|
pacman.database_copy(pacman.handle, database, path, use_ahriman_cache=True)
|
||||||
copy_mock.assert_not_called()
|
copy_mock.assert_not_called()
|
||||||
|
|
||||||
|
|
||||||
def test_database_copy_no_root_file(pacman: Pacman, repository_paths: RepositoryPaths, mocker: MockerFixture) -> None:
|
def test_database_copy_no_root_file(pacman: Pacman, mocker: MockerFixture) -> None:
|
||||||
"""
|
"""
|
||||||
must do not copy database if no repository file exists in filesystem
|
must do not copy database if no repository file exists in filesystem
|
||||||
"""
|
"""
|
||||||
@ -109,11 +110,11 @@ def test_database_copy_no_root_file(pacman: Pacman, repository_paths: Repository
|
|||||||
mocker.patch("pathlib.Path.is_file", return_value=False)
|
mocker.patch("pathlib.Path.is_file", return_value=False)
|
||||||
copy_mock = mocker.patch("shutil.copy")
|
copy_mock = mocker.patch("shutil.copy")
|
||||||
|
|
||||||
pacman.database_copy(pacman.handle, database, path, repository_paths, use_ahriman_cache=True)
|
pacman.database_copy(pacman.handle, database, path, use_ahriman_cache=True)
|
||||||
copy_mock.assert_not_called()
|
copy_mock.assert_not_called()
|
||||||
|
|
||||||
|
|
||||||
def test_database_copy_database_exist(pacman: Pacman, repository_paths: RepositoryPaths, mocker: MockerFixture) -> None:
|
def test_database_copy_database_exist(pacman: Pacman, mocker: MockerFixture) -> None:
|
||||||
"""
|
"""
|
||||||
must do not copy database if local cache already exists
|
must do not copy database if local cache already exists
|
||||||
"""
|
"""
|
||||||
@ -123,7 +124,7 @@ def test_database_copy_database_exist(pacman: Pacman, repository_paths: Reposito
|
|||||||
mocker.patch("pathlib.Path.is_file", return_value=True)
|
mocker.patch("pathlib.Path.is_file", return_value=True)
|
||||||
copy_mock = mocker.patch("shutil.copy")
|
copy_mock = mocker.patch("shutil.copy")
|
||||||
|
|
||||||
pacman.database_copy(pacman.handle, database, Path("root"), repository_paths, use_ahriman_cache=True)
|
pacman.database_copy(pacman.handle, database, Path("root"), use_ahriman_cache=True)
|
||||||
copy_mock.assert_not_called()
|
copy_mock.assert_not_called()
|
||||||
|
|
||||||
|
|
||||||
@ -131,71 +132,133 @@ def test_database_init(pacman: Pacman, configuration: Configuration) -> None:
|
|||||||
"""
|
"""
|
||||||
must init database with settings
|
must init database with settings
|
||||||
"""
|
"""
|
||||||
mirror = configuration.get("alpm", "mirror")
|
database = pacman.database_init(pacman.handle, "testing", "x86_64")
|
||||||
database = pacman.database_init(pacman.handle, "testing", mirror, "x86_64")
|
|
||||||
assert database.servers == ["https://geo.mirror.pkgbuild.com/testing/os/x86_64"]
|
assert database.servers == ["https://geo.mirror.pkgbuild.com/testing/os/x86_64"]
|
||||||
|
|
||||||
|
|
||||||
def test_database_sync(pacman: Pacman) -> None:
|
def test_database_init_local(pacman: Pacman, configuration: Configuration) -> None:
|
||||||
|
"""
|
||||||
|
must set file protocol for local databases
|
||||||
|
"""
|
||||||
|
_, repository_id = configuration.check_loaded()
|
||||||
|
database = pacman.database_init(MagicMock(), repository_id.name, repository_id.architecture)
|
||||||
|
assert database.servers == [f"file://{configuration.repository_paths.repository}"]
|
||||||
|
|
||||||
|
|
||||||
|
def test_database_sync(pacman: Pacman, mocker: MockerFixture) -> None:
|
||||||
"""
|
"""
|
||||||
must sync databases
|
must sync databases
|
||||||
"""
|
"""
|
||||||
handle_mock = MagicMock()
|
handle_mock = MagicMock()
|
||||||
core_mock = MagicMock()
|
|
||||||
extra_mock = MagicMock()
|
|
||||||
transaction_mock = MagicMock()
|
transaction_mock = MagicMock()
|
||||||
handle_mock.get_syncdbs.return_value = [core_mock, extra_mock]
|
handle_mock.get_syncdbs.return_value = [1, 2]
|
||||||
handle_mock.init_transaction.return_value = transaction_mock
|
handle_mock.init_transaction.return_value = transaction_mock
|
||||||
pacman.handle = handle_mock
|
|
||||||
|
|
||||||
pacman.database_sync(pacman.handle, force=False)
|
sync_mock = mocker.patch("ahriman.core.alpm.pacman_database.PacmanDatabase.sync")
|
||||||
|
|
||||||
|
pacman.database_sync(handle_mock, force=False)
|
||||||
handle_mock.init_transaction.assert_called_once_with()
|
handle_mock.init_transaction.assert_called_once_with()
|
||||||
core_mock.update.assert_called_once_with(False)
|
sync_mock.assert_has_calls([MockCall(force=False), MockCall(force=False)])
|
||||||
extra_mock.update.assert_called_once_with(False)
|
|
||||||
transaction_mock.release.assert_called_once_with()
|
transaction_mock.release.assert_called_once_with()
|
||||||
|
|
||||||
|
|
||||||
def test_database_sync_failed(pacman: Pacman) -> None:
|
def test_database_sync_forced(pacman: Pacman, mocker: MockerFixture) -> None:
|
||||||
"""
|
|
||||||
must sync databases even if there was exception
|
|
||||||
"""
|
|
||||||
handle_mock = MagicMock()
|
|
||||||
core_mock = MagicMock()
|
|
||||||
core_mock.update.side_effect = PyalpmError()
|
|
||||||
extra_mock = MagicMock()
|
|
||||||
handle_mock.get_syncdbs.return_value = [core_mock, extra_mock]
|
|
||||||
pacman.handle = handle_mock
|
|
||||||
|
|
||||||
pacman.database_sync(pacman.handle, force=False)
|
|
||||||
extra_mock.update.assert_called_once_with(False)
|
|
||||||
|
|
||||||
|
|
||||||
def test_database_sync_forced(pacman: Pacman) -> None:
|
|
||||||
"""
|
"""
|
||||||
must sync databases with force flag
|
must sync databases with force flag
|
||||||
"""
|
"""
|
||||||
handle_mock = MagicMock()
|
handle_mock = MagicMock()
|
||||||
core_mock = MagicMock()
|
handle_mock.get_syncdbs.return_value = [1]
|
||||||
handle_mock.get_syncdbs.return_value = [core_mock]
|
|
||||||
|
sync_mock = mocker.patch("ahriman.core.alpm.pacman_database.PacmanDatabase.sync")
|
||||||
|
|
||||||
|
pacman.database_sync(handle_mock, force=True)
|
||||||
|
sync_mock.assert_called_once_with(force=True)
|
||||||
|
|
||||||
|
|
||||||
|
def test_files(pacman: Pacman, package_ahriman: Package, mocker: MockerFixture, resource_path_root: Path) -> None:
|
||||||
|
"""
|
||||||
|
must load files from databases
|
||||||
|
"""
|
||||||
|
handle_mock = MagicMock()
|
||||||
|
handle_mock.get_syncdbs.return_value = [MagicMock()]
|
||||||
|
pacman.handle = handle_mock
|
||||||
|
tarball = resource_path_root / "core" / "arcanisrepo.files.tar.gz"
|
||||||
|
|
||||||
|
mocker.patch("pathlib.Path.is_file", return_value=True)
|
||||||
|
open_mock = mocker.patch("ahriman.core.alpm.pacman.tarfile.open", return_value=tarfile.open(tarball, "r:gz"))
|
||||||
|
|
||||||
|
files = pacman.files()
|
||||||
|
assert len(files) == 2
|
||||||
|
assert package_ahriman.base in files
|
||||||
|
assert Path("usr/bin/ahriman") in files[package_ahriman.base]
|
||||||
|
open_mock.assert_called_once_with(pytest.helpers.anyvar(int), "r:gz")
|
||||||
|
|
||||||
|
|
||||||
|
def test_files_package(pacman: Pacman, package_ahriman: Package, mocker: MockerFixture,
|
||||||
|
resource_path_root: Path) -> None:
|
||||||
|
"""
|
||||||
|
must load files only for the specified package
|
||||||
|
"""
|
||||||
|
handle_mock = MagicMock()
|
||||||
|
handle_mock.get_syncdbs.return_value = [MagicMock()]
|
||||||
pacman.handle = handle_mock
|
pacman.handle = handle_mock
|
||||||
|
|
||||||
pacman.database_sync(pacman.handle, force=True)
|
tarball = resource_path_root / "core" / "arcanisrepo.files.tar.gz"
|
||||||
handle_mock.init_transaction.assert_called_once_with()
|
|
||||||
core_mock.update.assert_called_once_with(True)
|
mocker.patch("pathlib.Path.is_file", return_value=True)
|
||||||
|
mocker.patch("ahriman.core.alpm.pacman.tarfile.open", return_value=tarfile.open(tarball, "r:gz"))
|
||||||
|
|
||||||
|
files = pacman.files(package_ahriman.base)
|
||||||
|
assert len(files) == 1
|
||||||
|
assert package_ahriman.base in files
|
||||||
|
|
||||||
|
|
||||||
def test_package_get(pacman: Pacman) -> None:
|
def test_files_skip(pacman: Pacman, mocker: MockerFixture) -> None:
|
||||||
|
"""
|
||||||
|
must return empty list if no database found
|
||||||
|
"""
|
||||||
|
handle_mock = MagicMock()
|
||||||
|
handle_mock.get_syncdbs.return_value = [MagicMock()]
|
||||||
|
pacman.handle = handle_mock
|
||||||
|
|
||||||
|
mocker.patch("pathlib.Path.is_file", return_value=False)
|
||||||
|
|
||||||
|
assert not pacman.files()
|
||||||
|
|
||||||
|
|
||||||
|
def test_files_no_content(pacman: Pacman, mocker: MockerFixture) -> None:
|
||||||
|
"""
|
||||||
|
must skip package if no content can be loaded
|
||||||
|
"""
|
||||||
|
handle_mock = MagicMock()
|
||||||
|
handle_mock.get_syncdbs.return_value = [MagicMock()]
|
||||||
|
pacman.handle = handle_mock
|
||||||
|
|
||||||
|
tar_mock = MagicMock()
|
||||||
|
tar_mock.getmembers.return_value = [MagicMock()]
|
||||||
|
tar_mock.extractfile.return_value = None
|
||||||
|
|
||||||
|
open_mock = MagicMock()
|
||||||
|
open_mock.__enter__.return_value = tar_mock
|
||||||
|
|
||||||
|
mocker.patch("pathlib.Path.is_file", return_value=True)
|
||||||
|
mocker.patch("ahriman.core.alpm.pacman.tarfile.open", return_value=open_mock)
|
||||||
|
|
||||||
|
assert not pacman.files()
|
||||||
|
|
||||||
|
|
||||||
|
def test_package(pacman: Pacman) -> None:
|
||||||
"""
|
"""
|
||||||
must retrieve package
|
must retrieve package
|
||||||
"""
|
"""
|
||||||
assert list(pacman.package_get("pacman"))
|
assert list(pacman.package("pacman"))
|
||||||
|
|
||||||
|
|
||||||
def test_package_get_empty(pacman: Pacman) -> None:
|
def test_package_empty(pacman: Pacman) -> None:
|
||||||
"""
|
"""
|
||||||
must return empty packages list without exception
|
must return empty packages list without exception
|
||||||
"""
|
"""
|
||||||
assert not list(pacman.package_get("some-random-name"))
|
assert not list(pacman.package("some-random-name"))
|
||||||
|
|
||||||
|
|
||||||
def test_packages(pacman: Pacman) -> None:
|
def test_packages(pacman: Pacman) -> None:
|
||||||
|
|||||||
203
tests/ahriman/core/alpm/test_pacman_database.py
Normal file
203
tests/ahriman/core/alpm/test_pacman_database.py
Normal file
@ -0,0 +1,203 @@
|
|||||||
|
import pytest
|
||||||
|
|
||||||
|
from pathlib import Path
|
||||||
|
from pytest_mock import MockerFixture
|
||||||
|
from unittest.mock import MagicMock, call as MockCall
|
||||||
|
|
||||||
|
from ahriman.core.alpm.pacman_database import PacmanDatabase
|
||||||
|
from ahriman.core.exceptions import PacmanError
|
||||||
|
|
||||||
|
|
||||||
|
def test_copy(pacman_database: PacmanDatabase, mocker: MockerFixture) -> None:
|
||||||
|
"""
|
||||||
|
must copy loca database file
|
||||||
|
"""
|
||||||
|
copy_mock = mocker.patch("shutil.copy")
|
||||||
|
pacman_database.copy(Path("remote"), Path("local"))
|
||||||
|
copy_mock.assert_called_once_with(Path("remote"), Path("local"))
|
||||||
|
|
||||||
|
|
||||||
|
def test_download(pacman_database: PacmanDatabase, mocker: MockerFixture) -> None:
|
||||||
|
"""
|
||||||
|
must download database by remote url
|
||||||
|
"""
|
||||||
|
response_obj = MagicMock()
|
||||||
|
response_obj.headers = {pacman_database.LAST_MODIFIED_HEADER: "Fri, 09 Feb 2024 00:25:55 GMT"}
|
||||||
|
response_obj.iter_content.return_value = ["chunk".encode("utf8")]
|
||||||
|
|
||||||
|
path = Path("local")
|
||||||
|
url = "url"
|
||||||
|
|
||||||
|
file_mock = MagicMock()
|
||||||
|
request_mock = mocker.patch("ahriman.core.alpm.pacman_database.PacmanDatabase.make_request",
|
||||||
|
return_value=response_obj)
|
||||||
|
open_mock = mocker.patch("pathlib.Path.open")
|
||||||
|
open_mock.return_value.__enter__.return_value = file_mock
|
||||||
|
mtime_mock = mocker.patch("os.utime")
|
||||||
|
|
||||||
|
pacman_database.download(url, path)
|
||||||
|
request_mock.assert_called_once_with("GET", url, stream=True)
|
||||||
|
open_mock.assert_called_once_with("wb")
|
||||||
|
file_mock.write.assert_called_once_with("chunk".encode("utf8"))
|
||||||
|
mtime_mock.assert_called_once_with(path, (1707438355.0, 1707438355.0))
|
||||||
|
|
||||||
|
|
||||||
|
def test_download_no_header(pacman_database: PacmanDatabase, mocker: MockerFixture) -> None:
|
||||||
|
"""
|
||||||
|
must raise exception in case if no last modified head found
|
||||||
|
"""
|
||||||
|
response_obj = MagicMock()
|
||||||
|
response_obj.headers = {}
|
||||||
|
mocker.patch("ahriman.core.alpm.pacman_database.PacmanDatabase.make_request", return_value=response_obj)
|
||||||
|
|
||||||
|
with pytest.raises(PacmanError):
|
||||||
|
pacman_database.download("url", Path("local"))
|
||||||
|
|
||||||
|
|
||||||
|
def test_is_outdated(pacman_database: PacmanDatabase, mocker: MockerFixture) -> None:
|
||||||
|
"""
|
||||||
|
must correctly check if file is outdated
|
||||||
|
"""
|
||||||
|
response_obj = MagicMock()
|
||||||
|
response_obj.headers = {pacman_database.LAST_MODIFIED_HEADER: "Fri, 09 Feb 2024 00:25:55 GMT"}
|
||||||
|
stat_mock = MagicMock()
|
||||||
|
stat_mock.st_mtime = 1707438354
|
||||||
|
|
||||||
|
path = Path("local")
|
||||||
|
url = "url"
|
||||||
|
|
||||||
|
mocker.patch("pathlib.Path.is_file", return_value=True)
|
||||||
|
mocker.patch("ahriman.core.alpm.pacman_database.PacmanDatabase.make_request", return_value=response_obj)
|
||||||
|
mocker.patch("pathlib.Path.stat", return_value=stat_mock)
|
||||||
|
|
||||||
|
assert pacman_database.is_outdated(url, path)
|
||||||
|
|
||||||
|
stat_mock.st_mtime += 1
|
||||||
|
assert not pacman_database.is_outdated(url, path)
|
||||||
|
|
||||||
|
stat_mock.st_mtime += 1
|
||||||
|
assert not pacman_database.is_outdated(url, path)
|
||||||
|
|
||||||
|
|
||||||
|
def test_is_outdated_not_a_file(pacman_database: PacmanDatabase, mocker: MockerFixture) -> None:
|
||||||
|
"""
|
||||||
|
must mark as outdated if no file was found
|
||||||
|
"""
|
||||||
|
mocker.patch("pathlib.Path.is_file", return_value=False)
|
||||||
|
assert pacman_database.is_outdated("url", Path("local"))
|
||||||
|
|
||||||
|
|
||||||
|
def test_is_outdated_no_header(pacman_database: PacmanDatabase, mocker: MockerFixture) -> None:
|
||||||
|
"""
|
||||||
|
must raise exception in case if no last modified head found during timestamp check
|
||||||
|
"""
|
||||||
|
response_obj = MagicMock()
|
||||||
|
response_obj.headers = {}
|
||||||
|
mocker.patch("ahriman.core.alpm.pacman_database.PacmanDatabase.make_request", return_value=response_obj)
|
||||||
|
mocker.patch("pathlib.Path.is_file", return_value=True)
|
||||||
|
|
||||||
|
with pytest.raises(PacmanError):
|
||||||
|
pacman_database.is_outdated("url", Path("local"))
|
||||||
|
|
||||||
|
|
||||||
|
def test_sync(pacman_database: PacmanDatabase, mocker: MockerFixture) -> None:
|
||||||
|
"""
|
||||||
|
must sync database
|
||||||
|
"""
|
||||||
|
sync_db_mock = mocker.patch("ahriman.core.alpm.pacman_database.PacmanDatabase.sync_packages")
|
||||||
|
sync_files_mock = mocker.patch("ahriman.core.alpm.pacman_database.PacmanDatabase.sync_files")
|
||||||
|
|
||||||
|
pacman_database.sync(force=True)
|
||||||
|
pacman_database.sync(force=False)
|
||||||
|
sync_db_mock.assert_has_calls([MockCall(force=True), MockCall(force=False)])
|
||||||
|
sync_files_mock.assert_not_called()
|
||||||
|
|
||||||
|
|
||||||
|
def test_sync_with_files(pacman_database: PacmanDatabase, mocker: MockerFixture) -> None:
|
||||||
|
"""
|
||||||
|
must sync database and files
|
||||||
|
"""
|
||||||
|
sync_db_mock = mocker.patch("ahriman.core.alpm.pacman_database.PacmanDatabase.sync_packages")
|
||||||
|
sync_files_mock = mocker.patch("ahriman.core.alpm.pacman_database.PacmanDatabase.sync_files")
|
||||||
|
pacman_database.sync_files_database = True
|
||||||
|
|
||||||
|
pacman_database.sync(force=True)
|
||||||
|
pacman_database.sync(force=False)
|
||||||
|
sync_db_mock.assert_has_calls([MockCall(force=True), MockCall(force=False)])
|
||||||
|
sync_files_mock.assert_has_calls([MockCall(force=True), MockCall(force=False)])
|
||||||
|
|
||||||
|
|
||||||
|
def test_sync_exception(pacman_database: PacmanDatabase, mocker: MockerFixture) -> None:
|
||||||
|
"""
|
||||||
|
must suppress all exceptions on failure
|
||||||
|
"""
|
||||||
|
mocker.patch("ahriman.core.alpm.pacman_database.PacmanDatabase.sync_packages", side_effect=Exception())
|
||||||
|
pacman_database.sync(force=True)
|
||||||
|
|
||||||
|
|
||||||
|
def test_sync_files(pacman_database: PacmanDatabase, mocker: MockerFixture) -> None:
|
||||||
|
"""
|
||||||
|
must sync files database
|
||||||
|
"""
|
||||||
|
outdated_mock = mocker.patch("ahriman.core.alpm.pacman_database.PacmanDatabase.is_outdated", return_value=True)
|
||||||
|
download_mock = mocker.patch("ahriman.core.alpm.pacman_database.PacmanDatabase.download")
|
||||||
|
|
||||||
|
pacman_database.sync_files(force=False)
|
||||||
|
outdated_mock.assert_called_once_with(
|
||||||
|
"https://geo.mirror.pkgbuild.com/core/os/x86_64/core.files.tar.gz", pytest.helpers.anyvar(int))
|
||||||
|
download_mock.assert_called_once_with(
|
||||||
|
"https://geo.mirror.pkgbuild.com/core/os/x86_64/core.files.tar.gz", pytest.helpers.anyvar(int))
|
||||||
|
|
||||||
|
|
||||||
|
def test_sync_files_not_outdated(pacman_database: PacmanDatabase, mocker: MockerFixture) -> None:
|
||||||
|
"""
|
||||||
|
must skip files sync if up-to-date
|
||||||
|
"""
|
||||||
|
mocker.patch("ahriman.core.alpm.pacman_database.PacmanDatabase.is_outdated", return_value=False)
|
||||||
|
download_mock = mocker.patch("ahriman.core.alpm.pacman_database.PacmanDatabase.download")
|
||||||
|
|
||||||
|
pacman_database.sync_files(force=False)
|
||||||
|
download_mock.assert_not_called()
|
||||||
|
|
||||||
|
|
||||||
|
def test_sync_files_force(pacman_database: PacmanDatabase, mocker: MockerFixture) -> None:
|
||||||
|
"""
|
||||||
|
must sync up-to-date files if force flag is set
|
||||||
|
"""
|
||||||
|
mocker.patch("ahriman.core.alpm.pacman_database.PacmanDatabase.is_outdated", return_value=False)
|
||||||
|
download_mock = mocker.patch("ahriman.core.alpm.pacman_database.PacmanDatabase.download")
|
||||||
|
|
||||||
|
pacman_database.sync_files(force=True)
|
||||||
|
download_mock.assert_called_once_with(
|
||||||
|
"https://geo.mirror.pkgbuild.com/core/os/x86_64/core.files.tar.gz", pytest.helpers.anyvar(int))
|
||||||
|
|
||||||
|
|
||||||
|
def test_sync_files_local(pacman_database: PacmanDatabase, mocker: MockerFixture) -> None:
|
||||||
|
"""
|
||||||
|
must copy local files instead of downloading them
|
||||||
|
"""
|
||||||
|
pacman_database.database.servers = ["file:///var"]
|
||||||
|
copy_mock = mocker.patch("ahriman.core.alpm.pacman_database.PacmanDatabase.copy")
|
||||||
|
|
||||||
|
pacman_database.sync_files(force=False)
|
||||||
|
copy_mock.assert_called_once_with(Path("/var/core.files.tar.gz"), pytest.helpers.anyvar(int))
|
||||||
|
|
||||||
|
|
||||||
|
def test_sync_files_unknown_source(pacman_database: PacmanDatabase) -> None:
|
||||||
|
"""
|
||||||
|
must raise an exception in case if server scheme is unsupported
|
||||||
|
"""
|
||||||
|
pacman_database.database.servers = ["some random string"]
|
||||||
|
with pytest.raises(PacmanError):
|
||||||
|
pacman_database.sync_files(force=False)
|
||||||
|
|
||||||
|
|
||||||
|
def test_sync_packages(pacman_database: PacmanDatabase) -> None:
|
||||||
|
"""
|
||||||
|
must sync packages by using pyalpm method
|
||||||
|
"""
|
||||||
|
pacman_database.database = MagicMock()
|
||||||
|
|
||||||
|
pacman_database.sync_packages(force=True)
|
||||||
|
pacman_database.sync_packages(force=False)
|
||||||
|
pacman_database.database.update.assert_has_calls([MockCall(True), MockCall(False)])
|
||||||
@ -26,13 +26,28 @@ def test_repo_add(repo: Repo, mocker: MockerFixture) -> None:
|
|||||||
|
|
||||||
def test_repo_init(repo: Repo, mocker: MockerFixture) -> None:
|
def test_repo_init(repo: Repo, mocker: MockerFixture) -> None:
|
||||||
"""
|
"""
|
||||||
must call repo-add with empty package list on repo initializing
|
must create empty database files
|
||||||
"""
|
"""
|
||||||
check_output_mock = mocker.patch("ahriman.core.alpm.repo.check_output")
|
mocker.patch("pathlib.Path.exists", return_value=False)
|
||||||
|
touch_mock = mocker.patch("pathlib.Path.touch")
|
||||||
|
symlink_mock = mocker.patch("pathlib.Path.symlink_to")
|
||||||
|
|
||||||
repo.init()
|
repo.init()
|
||||||
check_output_mock.assert_called_once() # it will be checked later
|
touch_mock.assert_called_once_with(exist_ok=True)
|
||||||
assert check_output_mock.call_args[0][0] == "repo-add"
|
symlink_mock.assert_called_once_with(repo.repo_path)
|
||||||
|
|
||||||
|
|
||||||
|
def test_repo_init_skip(repo: Repo, mocker: MockerFixture) -> None:
|
||||||
|
"""
|
||||||
|
must do not create files if database already exists
|
||||||
|
"""
|
||||||
|
mocker.patch("pathlib.Path.exists", return_value=True)
|
||||||
|
touch_mock = mocker.patch("pathlib.Path.touch")
|
||||||
|
symlink_mock = mocker.patch("pathlib.Path.symlink_to")
|
||||||
|
|
||||||
|
repo.init()
|
||||||
|
touch_mock.assert_not_called()
|
||||||
|
symlink_mock.assert_not_called()
|
||||||
|
|
||||||
|
|
||||||
def test_repo_remove(repo: Repo, mocker: MockerFixture) -> None:
|
def test_repo_remove(repo: Repo, mocker: MockerFixture) -> None:
|
||||||
|
|||||||
@ -1,5 +1,8 @@
|
|||||||
|
import pytest
|
||||||
|
|
||||||
from pathlib import Path
|
from pathlib import Path
|
||||||
from pytest_mock import MockerFixture
|
from pytest_mock import MockerFixture
|
||||||
|
from unittest.mock import call as MockCall
|
||||||
|
|
||||||
from ahriman.core.build_tools.task import Task
|
from ahriman.core.build_tools.task import Task
|
||||||
from ahriman.core.database import SQLite
|
from ahriman.core.database import SQLite
|
||||||
@ -9,9 +12,83 @@ def test_build(task_ahriman: Task, mocker: MockerFixture) -> None:
|
|||||||
"""
|
"""
|
||||||
must build package
|
must build package
|
||||||
"""
|
"""
|
||||||
|
local = Path("local")
|
||||||
check_output_mock = mocker.patch("ahriman.core.build_tools.task.check_output")
|
check_output_mock = mocker.patch("ahriman.core.build_tools.task.check_output")
|
||||||
task_ahriman.build(Path("ahriman"))
|
|
||||||
check_output_mock.assert_called()
|
task_ahriman.build(local)
|
||||||
|
check_output_mock.assert_has_calls([
|
||||||
|
MockCall(
|
||||||
|
"extra-x86_64-build", "-r", str(task_ahriman.paths.chroot), "--", "--", "--skippgpcheck",
|
||||||
|
exception=pytest.helpers.anyvar(int),
|
||||||
|
cwd=local,
|
||||||
|
logger=task_ahriman.logger,
|
||||||
|
user=task_ahriman.uid,
|
||||||
|
environment={},
|
||||||
|
),
|
||||||
|
MockCall(
|
||||||
|
"makepkg", "--packagelist",
|
||||||
|
exception=pytest.helpers.anyvar(int),
|
||||||
|
cwd=local,
|
||||||
|
logger=task_ahriman.logger,
|
||||||
|
environment={},
|
||||||
|
),
|
||||||
|
])
|
||||||
|
|
||||||
|
|
||||||
|
def test_build_environment(task_ahriman: Task, mocker: MockerFixture) -> None:
|
||||||
|
"""
|
||||||
|
must build package with environment variables set
|
||||||
|
"""
|
||||||
|
local = Path("local")
|
||||||
|
check_output_mock = mocker.patch("ahriman.core.build_tools.task.check_output")
|
||||||
|
environment = {"variable": "value"}
|
||||||
|
|
||||||
|
task_ahriman.build(local, **environment, empty=None)
|
||||||
|
check_output_mock.assert_has_calls([
|
||||||
|
MockCall(
|
||||||
|
"extra-x86_64-build", "-r", str(task_ahriman.paths.chroot), "--", "--", "--skippgpcheck",
|
||||||
|
exception=pytest.helpers.anyvar(int),
|
||||||
|
cwd=local,
|
||||||
|
logger=task_ahriman.logger,
|
||||||
|
user=task_ahriman.uid,
|
||||||
|
environment=environment,
|
||||||
|
),
|
||||||
|
MockCall(
|
||||||
|
"makepkg", "--packagelist",
|
||||||
|
exception=pytest.helpers.anyvar(int),
|
||||||
|
cwd=local,
|
||||||
|
logger=task_ahriman.logger,
|
||||||
|
environment=environment,
|
||||||
|
),
|
||||||
|
])
|
||||||
|
|
||||||
|
|
||||||
|
def test_build_no_debug(task_ahriman: Task, mocker: MockerFixture) -> None:
|
||||||
|
"""
|
||||||
|
must filter debug packages from result
|
||||||
|
"""
|
||||||
|
local = Path("local")
|
||||||
|
check_output_mock = mocker.patch("ahriman.core.build_tools.task.check_output")
|
||||||
|
task_ahriman.include_debug_packages = False
|
||||||
|
|
||||||
|
task_ahriman.build(local)
|
||||||
|
check_output_mock.assert_has_calls([
|
||||||
|
MockCall(
|
||||||
|
"extra-x86_64-build", "-r", str(task_ahriman.paths.chroot), "--", "--", "--skippgpcheck",
|
||||||
|
exception=pytest.helpers.anyvar(int),
|
||||||
|
cwd=local,
|
||||||
|
logger=task_ahriman.logger,
|
||||||
|
user=task_ahriman.uid,
|
||||||
|
environment={},
|
||||||
|
),
|
||||||
|
MockCall(
|
||||||
|
"makepkg", "--packagelist", "OPTIONS=(!debug)",
|
||||||
|
exception=pytest.helpers.anyvar(int),
|
||||||
|
cwd=local,
|
||||||
|
logger=task_ahriman.logger,
|
||||||
|
environment={},
|
||||||
|
),
|
||||||
|
])
|
||||||
|
|
||||||
|
|
||||||
def test_init(task_ahriman: Task, database: SQLite, mocker: MockerFixture) -> None:
|
def test_init(task_ahriman: Task, database: SQLite, mocker: MockerFixture) -> None:
|
||||||
|
|||||||
@ -0,0 +1,8 @@
|
|||||||
|
from ahriman.core.database.migrations.m013_dependencies import steps
|
||||||
|
|
||||||
|
|
||||||
|
def test_migration_dependencies() -> None:
|
||||||
|
"""
|
||||||
|
migration must not be empty
|
||||||
|
"""
|
||||||
|
assert steps
|
||||||
@ -0,0 +1,61 @@
|
|||||||
|
from pathlib import Path
|
||||||
|
|
||||||
|
from ahriman.core.database import SQLite
|
||||||
|
from ahriman.models.dependencies import Dependencies
|
||||||
|
from ahriman.models.package import Package
|
||||||
|
from ahriman.models.repository_id import RepositoryId
|
||||||
|
|
||||||
|
|
||||||
|
def test_dependencies_insert_get(database: SQLite, package_ahriman: Package) -> None:
|
||||||
|
"""
|
||||||
|
must insert and get dependencies
|
||||||
|
"""
|
||||||
|
dependencies = Dependencies(package_ahriman.base, {Path("usr/lib/python3.11/site-packages"): ["python"]})
|
||||||
|
database.dependencies_insert(dependencies)
|
||||||
|
assert database.dependencies_get(package_ahriman.base) == [dependencies]
|
||||||
|
|
||||||
|
dependencies2 = Dependencies(package_ahriman.base, {Path("usr/lib/python3.11/site-packages"): ["python3"]})
|
||||||
|
database.dependencies_insert(dependencies2, RepositoryId("i686", database._repository_id.name))
|
||||||
|
assert database.dependencies_get() == [dependencies]
|
||||||
|
assert database.dependencies_get(package_ahriman.base) == [dependencies]
|
||||||
|
assert database.dependencies_get(
|
||||||
|
package_ahriman.base, RepositoryId("i686", database._repository_id.name)) == [dependencies2]
|
||||||
|
|
||||||
|
|
||||||
|
def test_dependencies_insert_remove(database: SQLite, package_ahriman: Package,
|
||||||
|
package_python_schedule: Package) -> None:
|
||||||
|
"""
|
||||||
|
must remove dependencies for the package
|
||||||
|
"""
|
||||||
|
dependencies1 = Dependencies(package_ahriman.base, {Path("usr"): ["python"]})
|
||||||
|
database.dependencies_insert(dependencies1)
|
||||||
|
dependencies2 = Dependencies(package_python_schedule.base, {Path("usr"): ["filesystem"]})
|
||||||
|
database.dependencies_insert(dependencies2)
|
||||||
|
dependencies3 = Dependencies(package_ahriman.base, {Path("usr"): ["python3"]})
|
||||||
|
database.dependencies_insert(dependencies3, RepositoryId("i686", database._repository_id.name))
|
||||||
|
|
||||||
|
assert database.dependencies_get() == [dependencies1, dependencies2]
|
||||||
|
|
||||||
|
database.dependencies_remove(package_ahriman.base)
|
||||||
|
assert database.dependencies_get(package_ahriman.base) == []
|
||||||
|
assert database.dependencies_get(package_python_schedule.base) == [dependencies2]
|
||||||
|
|
||||||
|
# insert null
|
||||||
|
database.dependencies_remove(package_ahriman.base, RepositoryId("i686", database._repository_id.name))
|
||||||
|
assert database.dependencies_get(package_ahriman.base, RepositoryId("i686", database._repository_id.name)) == []
|
||||||
|
assert database.dependencies_get(package_python_schedule.base) == [dependencies2]
|
||||||
|
|
||||||
|
|
||||||
|
def test_dependencies_insert_remove_full(database: SQLite, package_ahriman: Package,
|
||||||
|
package_python_schedule: Package) -> None:
|
||||||
|
"""
|
||||||
|
must remove all dependencies for the repository
|
||||||
|
"""
|
||||||
|
database.dependencies_insert(Dependencies(package_ahriman.base, {Path("usr"): ["python"]}))
|
||||||
|
database.dependencies_insert(Dependencies(package_python_schedule.base, {Path("usr"): ["filesystem"]}))
|
||||||
|
database.dependencies_insert(Dependencies(package_ahriman.base, {Path("usr"): ["python3"]}),
|
||||||
|
RepositoryId("i686", database._repository_id.name))
|
||||||
|
|
||||||
|
database.dependencies_remove(None)
|
||||||
|
assert database.dependencies_get() == []
|
||||||
|
assert database.dependencies_get(package_ahriman.base, RepositoryId("i686", database._repository_id.name))
|
||||||
@ -33,3 +33,21 @@ def test_init_skip_migration(database: SQLite, configuration: Configuration, moc
|
|||||||
|
|
||||||
database.init(configuration)
|
database.init(configuration)
|
||||||
migrate_schema_mock.assert_not_called()
|
migrate_schema_mock.assert_not_called()
|
||||||
|
|
||||||
|
|
||||||
|
def test_package_clear(database: SQLite, mocker: MockerFixture) -> None:
|
||||||
|
"""
|
||||||
|
must clear package data
|
||||||
|
"""
|
||||||
|
build_queue_mock = mocker.patch("ahriman.core.database.SQLite.build_queue_clear")
|
||||||
|
patches_mock = mocker.patch("ahriman.core.database.SQLite.patches_remove")
|
||||||
|
logs_mock = mocker.patch("ahriman.core.database.SQLite.logs_remove")
|
||||||
|
changes_mock = mocker.patch("ahriman.core.database.SQLite.changes_remove")
|
||||||
|
dependencies_mock = mocker.patch("ahriman.core.database.SQLite.dependencies_remove")
|
||||||
|
|
||||||
|
database.package_clear("package")
|
||||||
|
build_queue_mock.assert_called_once_with("package")
|
||||||
|
patches_mock.assert_called_once_with("package", [])
|
||||||
|
logs_mock.assert_called_once_with("package", None)
|
||||||
|
changes_mock.assert_called_once_with("package")
|
||||||
|
dependencies_mock.assert_called_once_with("package")
|
||||||
|
|||||||
@ -3,7 +3,6 @@ from pytest_mock import MockerFixture
|
|||||||
from ahriman.core.configuration import Configuration
|
from ahriman.core.configuration import Configuration
|
||||||
from ahriman.core.database import SQLite
|
from ahriman.core.database import SQLite
|
||||||
from ahriman.core.gitremote import RemotePushTrigger
|
from ahriman.core.gitremote import RemotePushTrigger
|
||||||
from ahriman.models.context_key import ContextKey
|
|
||||||
from ahriman.models.package import Package
|
from ahriman.models.package import Package
|
||||||
from ahriman.models.result import Result
|
from ahriman.models.result import Result
|
||||||
|
|
||||||
@ -30,5 +29,5 @@ def test_on_result(configuration: Configuration, result: Result, package_ahriman
|
|||||||
trigger = RemotePushTrigger(repository_id, configuration)
|
trigger = RemotePushTrigger(repository_id, configuration)
|
||||||
|
|
||||||
trigger.on_result(result, [package_ahriman])
|
trigger.on_result(result, [package_ahriman])
|
||||||
database_mock.assert_called_once_with(ContextKey("database", SQLite))
|
database_mock.assert_called_once_with(SQLite)
|
||||||
run_mock.assert_called_once_with(result)
|
run_mock.assert_called_once_with(result)
|
||||||
|
|||||||
@ -82,34 +82,40 @@ def test_make_request(mocker: MockerFixture) -> None:
|
|||||||
|
|
||||||
auth = client.auth = ("username", "password")
|
auth = client.auth = ("username", "password")
|
||||||
assert client.make_request("GET", "url9") is not None
|
assert client.make_request("GET", "url9") is not None
|
||||||
|
client.auth = None
|
||||||
|
|
||||||
|
assert client.make_request("GET", "url10", stream=True) is not None
|
||||||
|
|
||||||
request_mock.assert_has_calls([
|
request_mock.assert_has_calls([
|
||||||
MockCall("GET", "url1", params=None, data=None, headers=None, files=None, json=None,
|
MockCall("GET", "url1", params=None, data=None, headers=None, files=None, json=None,
|
||||||
auth=None, timeout=client.timeout),
|
stream=None, auth=None, timeout=client.timeout),
|
||||||
MockCall().raise_for_status(),
|
MockCall().raise_for_status(),
|
||||||
MockCall("GET", "url2", params=[("param", "value")], data=None, headers=None, files=None, json=None,
|
MockCall("GET", "url2", params=[("param", "value")], data=None, headers=None, files=None, json=None,
|
||||||
auth=None, timeout=client.timeout),
|
stream=None, auth=None, timeout=client.timeout),
|
||||||
MockCall().raise_for_status(),
|
MockCall().raise_for_status(),
|
||||||
MockCall("POST", "url3", params=None, data=None, headers=None, files=None, json=None,
|
MockCall("POST", "url3", params=None, data=None, headers=None, files=None, json=None,
|
||||||
auth=None, timeout=client.timeout),
|
stream=None, auth=None, timeout=client.timeout),
|
||||||
MockCall().raise_for_status(),
|
MockCall().raise_for_status(),
|
||||||
MockCall("POST", "url4", params=None, data=None, headers=None, files=None, json={"param": "value"},
|
MockCall("POST", "url4", params=None, data=None, headers=None, files=None, json={"param": "value"},
|
||||||
auth=None, timeout=client.timeout),
|
stream=None, auth=None, timeout=client.timeout),
|
||||||
MockCall().raise_for_status(),
|
MockCall().raise_for_status(),
|
||||||
MockCall("POST", "url5", params=None, data={"param": "value"}, headers=None, files=None, json=None,
|
MockCall("POST", "url5", params=None, data={"param": "value"}, headers=None, files=None, json=None,
|
||||||
auth=None, timeout=client.timeout),
|
stream=None, auth=None, timeout=client.timeout),
|
||||||
MockCall().raise_for_status(),
|
MockCall().raise_for_status(),
|
||||||
MockCall("POST", "url6", params=None, data=None, headers=None, files={"file": "tuple"}, json=None,
|
MockCall("POST", "url6", params=None, data=None, headers=None, files={"file": "tuple"}, json=None,
|
||||||
auth=None, timeout=client.timeout),
|
stream=None, auth=None, timeout=client.timeout),
|
||||||
MockCall().raise_for_status(),
|
MockCall().raise_for_status(),
|
||||||
MockCall("DELETE", "url7", params=None, data=None, headers=None, files=None, json=None,
|
MockCall("DELETE", "url7", params=None, data=None, headers=None, files=None, json=None,
|
||||||
auth=None, timeout=client.timeout),
|
stream=None, auth=None, timeout=client.timeout),
|
||||||
MockCall().raise_for_status(),
|
MockCall().raise_for_status(),
|
||||||
MockCall("GET", "url8", params=None, data=None, headers={"user-agent": "ua"}, files=None, json=None,
|
MockCall("GET", "url8", params=None, data=None, headers={"user-agent": "ua"}, files=None, json=None,
|
||||||
auth=None, timeout=client.timeout),
|
stream=None, auth=None, timeout=client.timeout),
|
||||||
MockCall().raise_for_status(),
|
MockCall().raise_for_status(),
|
||||||
MockCall("GET", "url9", params=None, data=None, headers=None, files=None, json=None,
|
MockCall("GET", "url9", params=None, data=None, headers=None, files=None, json=None,
|
||||||
auth=auth, timeout=client.timeout),
|
stream=None, auth=auth, timeout=client.timeout),
|
||||||
|
MockCall().raise_for_status(),
|
||||||
|
MockCall("GET", "url10", params=None, data=None, headers=None, files=None, json=None,
|
||||||
|
stream=True, auth=None, timeout=client.timeout),
|
||||||
MockCall().raise_for_status(),
|
MockCall().raise_for_status(),
|
||||||
])
|
])
|
||||||
|
|
||||||
@ -151,4 +157,4 @@ def test_make_request_session() -> None:
|
|||||||
client.make_request("GET", "url", session=session_mock)
|
client.make_request("GET", "url", session=session_mock)
|
||||||
session_mock.request.assert_called_once_with(
|
session_mock.request.assert_called_once_with(
|
||||||
"GET", "url", params=None, data=None, headers=None, files=None, json=None,
|
"GET", "url", params=None, data=None, headers=None, files=None, json=None,
|
||||||
auth=None, timeout=client.timeout)
|
stream=None, auth=None, timeout=client.timeout)
|
||||||
|
|||||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user