diff --git a/package/archlinux/PKGBUILD b/package/archlinux/PKGBUILD index d02ace1d..bf083882 100644 --- a/package/archlinux/PKGBUILD +++ b/package/archlinux/PKGBUILD @@ -23,7 +23,7 @@ optdepends=('aws-cli: sync to s3' source=("https://github.com/arcan1s/ahriman/releases/download/$pkgver/$pkgname-$pkgver-src.tar.xz" 'ahriman.sysusers' 'ahriman.tmpfiles') -sha512sums=('f81de308af2d462e4904b143808bd4f22c5479fc2ac56c6a6f562be08816d97ddc6daae0b453db98cbc236ce0abad4100f2ae4729a7444a16fbf4b61b2b7d655' +sha512sums=('1e962492929504e655aa93a943a3bc166583cac2d62db095cbf6b26c80528fd98af04925527f8d683603fc6aece50af8eefe716d5f243d821a5ffec596f96891' '13718afec2c6786a18f0b223ef8e58dccf0688bca4cdbe203f14071f5031ed20120eb0ce38b52c76cfd6e8b6581a9c9eaa2743eb11abbaca637451a84c33f075' '55b20f6da3d66e7bbf2add5d95a3b60632df121717d25a993e56e737d14f51fe063eb6f1b38bd81cc32e05db01c0c1d80aaa720c45cde87f238d8b46cdb8cbc4') backup=('etc/ahriman.ini' diff --git a/package/share/ahriman/build-status.jinja2 b/package/share/ahriman/build-status.jinja2 index 1f372597..e4ac2d0c 100644 --- a/package/share/ahriman/build-status.jinja2 +++ b/package/share/ahriman/build-status.jinja2 @@ -11,7 +11,7 @@
-

ahriman {{ version|e }}

+

ahriman {{ version|e }} ({{ architecture|e }})

{% include "search-line.jinja2" %} @@ -21,7 +21,6 @@ package base packages version - architecture last update status @@ -31,7 +30,6 @@ {{ package.base|e }} {{ package.packages|join("
"|safe) }} {{ package.version|e }} - {{ architecture|e }} {{ package.timestamp|e }} {{ package.status|e }} diff --git a/package/share/ahriman/repo-index.jinja2 b/package/share/ahriman/repo-index.jinja2 index 952bf78d..754d1e26 100644 --- a/package/share/ahriman/repo-index.jinja2 +++ b/package/share/ahriman/repo-index.jinja2 @@ -33,14 +33,12 @@ package version - architecture {% for package in packages %} {{ package.name|e }} {{ package.version|e }} - {{ architecture|e }} {% endfor %} diff --git a/src/ahriman/application/lock.py b/src/ahriman/application/lock.py index 2cf19bfb..41a95ca0 100644 --- a/src/ahriman/application/lock.py +++ b/src/ahriman/application/lock.py @@ -30,7 +30,7 @@ from ahriman.core.exceptions import DuplicateRun class Lock: def __init__(self, path: Optional[str], architecture: str, force: bool) -> None: - self.path: Optional[str] = f'{path}_{architecture}' if self.path is not None else None + self.path = f'{path}_{architecture}' if path is not None else None self.force = force def __enter__(self) -> Lock: diff --git a/src/ahriman/core/report/html.py b/src/ahriman/core/report/html.py index 4ec648b4..fd820624 100644 --- a/src/ahriman/core/report/html.py +++ b/src/ahriman/core/report/html.py @@ -32,7 +32,6 @@ class HTML(Report): def __init__(self, architecture: str, config: Configuration) -> None: Report.__init__(self, architecture, config) - self.architecture = architecture section = config.get_section_name('html', architecture) self.report_path = config.get(section, 'path') self.link_path = config.get(section, 'link_path') @@ -63,7 +62,6 @@ class HTML(Report): comparator: Callable[[Dict[str, str]], str] = lambda item: item['filename'] html = template.render( - architecture=self.architecture, homepage=self.homepage, link_path=self.link_path, has_package_signed=SignSettings.SignPackages in self.sign_targets,