arcanis/ahriman
1
0
Fork 0
mirror of https://github.com/arcan1s/ahriman.git synced 2025-06-28 14:51:43 +00:00
Code Issues Projects Releases Wiki Activity

drop architecture coz it is always same

Browse Source
This commit is contained in:
Evgenii Alekseev
2021-03-13 17:12:36 +03:00
parent 4b98b21a70
commit 4727894349
5 changed files with 3 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
package/archlinux/PKGBUILD
View File

@ -23,7 +23,7 @@ optdepends=('aws-cli: sync to s3'
source=("https://github.com/arcan1s/ahriman/releases/download/$pkgver/$pkgname-$pkgver-src.tar.xz" source=("https://github.com/arcan1s/ahriman/releases/download/$pkgver/$pkgname-$pkgver-src.tar.xz"
'ahriman.sysusers' 'ahriman.sysusers'
'ahriman.tmpfiles') 'ahriman.tmpfiles')
sha512sums=('f81de308af2d462e4904b143808bd4f22c5479fc2ac56c6a6f562be08816d97ddc6daae0b453db98cbc236ce0abad4100f2ae4729a7444a16fbf4b61b2b7d655' sha512sums=('1e962492929504e655aa93a943a3bc166583cac2d62db095cbf6b26c80528fd98af04925527f8d683603fc6aece50af8eefe716d5f243d821a5ffec596f96891'
'13718afec2c6786a18f0b223ef8e58dccf0688bca4cdbe203f14071f5031ed20120eb0ce38b52c76cfd6e8b6581a9c9eaa2743eb11abbaca637451a84c33f075' '13718afec2c6786a18f0b223ef8e58dccf0688bca4cdbe203f14071f5031ed20120eb0ce38b52c76cfd6e8b6581a9c9eaa2743eb11abbaca637451a84c33f075'
'55b20f6da3d66e7bbf2add5d95a3b60632df121717d25a993e56e737d14f51fe063eb6f1b38bd81cc32e05db01c0c1d80aaa720c45cde87f238d8b46cdb8cbc4') '55b20f6da3d66e7bbf2add5d95a3b60632df121717d25a993e56e737d14f51fe063eb6f1b38bd81cc32e05db01c0c1d80aaa720c45cde87f238d8b46cdb8cbc4')
backup=('etc/ahriman.ini' backup=('etc/ahriman.ini'

4
package/share/ahriman/build-status.jinja2
View File

@ -11,7 +11,7 @@
<body> <body>
<div class="root"> <div class="root">
<h1>ahriman {{ version|e }}</h1> <h1>ahriman {{ version|e }} ({{ architecture|e }})</h1>
{% include "search-line.jinja2" %} {% include "search-line.jinja2" %}
@ -21,7 +21,6 @@
<th>package base</th> <th>package base</th>
<th>packages</th> <th>packages</th>
<th>version</th> <th>version</th>
<th>architecture</th>
<th>last update</th> <th>last update</th>
<th>status</th> <th>status</th>
</tr> </tr>
@ -31,7 +30,6 @@
<td class="include-search"><a href="{{ package.web_url|e }}" title="{{ package.base|e }}">{{ package.base|e }}</a></td> <td class="include-search"><a href="{{ package.web_url|e }}" title="{{ package.base|e }}">{{ package.base|e }}</a></td>
<td class="include-search">{{ package.packages|join("<br>"|safe) }}</td> <td class="include-search">{{ package.packages|join("<br>"|safe) }}</td>
<td>{{ package.version|e }}</td> <td>{{ package.version|e }}</td>
<td>{{ architecture|e }}</td>
<td>{{ package.timestamp|e }}</td> <td>{{ package.timestamp|e }}</td>
<td class="package-{{ package.status|e }}">{{ package.status|e }}</td> <td class="package-{{ package.status|e }}">{{ package.status|e }}</td>
</tr> </tr>

2
package/share/ahriman/repo-index.jinja2
View File

@ -33,14 +33,12 @@
<tr class="header"> <tr class="header">
<th>package</th> <th>package</th>
<th>version</th> <th>version</th>
<th>architecture</th>
</tr> </tr>
{% for package in packages %} {% for package in packages %}
<tr class="package"> <tr class="package">
<td class="include-search"><a href="{{ link_path|e }}/{{ package.filename|e }}" title="{{ package.name|e }}">{{ package.name|e }}</a></td> <td class="include-search"><a href="{{ link_path|e }}/{{ package.filename|e }}" title="{{ package.name|e }}">{{ package.name|e }}</a></td>
<td>{{ package.version|e }}</td> <td>{{ package.version|e }}</td>
<td>{{ architecture|e }}</td>
</tr> </tr>
{% endfor %} {% endfor %}
</table> </table>

2
src/ahriman/application/lock.py
View File

@ -30,7 +30,7 @@ from ahriman.core.exceptions import DuplicateRun
class Lock: class Lock:
def __init__(self, path: Optional[str], architecture: str, force: bool) -> None: 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 self.force = force
def __enter__(self) -> Lock: def __enter__(self) -> Lock:

2
src/ahriman/core/report/html.py
View File

@ -32,7 +32,6 @@ class HTML(Report):
def __init__(self, architecture: str, config: Configuration) -> None: def __init__(self, architecture: str, config: Configuration) -> None:
Report.__init__(self, architecture, config) Report.__init__(self, architecture, config)
self.architecture = architecture
section = config.get_section_name('html', architecture) section = config.get_section_name('html', architecture)
self.report_path = config.get(section, 'path') self.report_path = config.get(section, 'path')
self.link_path = config.get(section, 'link_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'] comparator: Callable[[Dict[str, str]], str] = lambda item: item['filename']
html = template.render( html = template.render(
architecture=self.architecture,
homepage=self.homepage, homepage=self.homepage,
link_path=self.link_path, link_path=self.link_path,
has_package_signed=SignSettings.SignPackages in self.sign_targets, has_package_signed=SignSettings.SignPackages in self.sign_targets,