external/aurweb
0
0
Fork 0
mirror of https://gitlab.archlinux.org/archlinux/aurweb.git synced 2025-02-03 10:43:03 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

bugfix: fix extra dependency annotations

Browse source 
These were being displayed regardless of the dep type
and state of DepDesc. This is fixed with this commit.

Signed-off-by: Kevin Morris <kevr@0cost.org>
This commit is contained in:
Kevin Morris 2021-07-27 22:03:38 -07:00
parent 88569b6d09
commit 04d1c81d3d
3 changed files with 16 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
aurweb/packages/util.py
View file

@ -46,6 +46,8 @@ def dep_extra(dep: PackageDependency) -> str:
@register_filter("dep_extra_desc") @register_filter("dep_extra_desc")
def dep_extra_desc(dep: PackageDependency) -> str: def dep_extra_desc(dep: PackageDependency) -> str:
extra = dep_extra(dep) extra = dep_extra(dep)
if not dep.DepDesc:
return extra
return extra + f" – {dep.DepDesc}" return extra + f" – {dep.DepDesc}"

6
templates/partials/packages/package_metadata.html
View file

@ -16,9 +16,11 @@
</a> </a>
{% endif %} {% endif %}
{{ dep.Package | provides_list(dep.DepName) | safe }} {{ dep.Package | provides_list(dep.DepName) | safe }}
{% set extra = dep | dep_extra %} <!-- If this dependency type is an optdepends (id: 4). -->
{% if extra %} {% if dep.DepTypeID == 4 %}
<em>{{ dep | dep_extra_desc }}</em> <em>{{ dep | dep_extra_desc }}</em>
{% else %}
<em>{{ dep | dep_extra }}</em>
{% endif %} {% endif %}
</li> </li>
{% endfor %} {% endfor %}

11
test/test_packages_routes.py
View file

@ -247,7 +247,15 @@ def test_package_dependencies(client: TestClient, maintainer: User,
dep_type_name="optdepends", dep_type_name="optdepends",
autocommit=False) autocommit=False)
broken_dep = create_package_dep(package, "test-dep-5", # Heh. Another optdepends to test one with a description.
opt_desc_dep_pkg = create_package("test-dep-5", maintainer,
autocommit=False)
opt_desc_dep = create_package_dep(package, opt_desc_dep_pkg.Name,
dep_type_name="optdepends",
autocommit=False)
opt_desc_dep.DepDesc = "Test description."
broken_dep = create_package_dep(package, "test-dep-6",
dep_type_name="depends", dep_type_name="depends",
autocommit=False) autocommit=False)
@ -273,6 +281,7 @@ def test_package_dependencies(client: TestClient, maintainer: User,
make_dep.DepName, make_dep.DepName,
check_dep.DepName, check_dep.DepName,
opt_dep.DepName, opt_dep.DepName,
opt_desc_dep.DepName,
official_dep.DepName official_dep.DepName
] ]
pkgdeps = root.findall('.//ul[@id="pkgdepslist"]/li/a') pkgdeps = root.findall('.//ul[@id="pkgdepslist"]/li/a')