diff options
| author | Dan McGee <dan@archlinux.org> | 2011-09-08 14:10:13 -0500 |
|---|---|---|
| committer | Dan McGee <dan@archlinux.org> | 2011-09-08 14:10:13 -0500 |
| commit | 293e42fc55ca0ee8f67d5bdcb3d32fd0ec93786e (patch) | |
| tree | 2d9364e0f48645f2b39c6c27827b2f5c6fbfba84 | |
| parent | f173a03857e92268412196cd8e7c0f5d27fb6a38 (diff) | |
List packages in required by list with depend provided by this package
Implements FS#25862. Most noticable on package like util-linux
(util-linux-ng) and openjdk6 (java-runtime, java-environment).
Signed-off-by: Dan McGee <dan@archlinux.org>
| -rw-r--r-- | main/models.py | 4 | ||||
| -rw-r--r-- | templates/packages/details.html | 1 |
2 files changed, 4 insertions, 1 deletions
diff --git a/main/models.py b/main/models.py index e0681abf..1efca78d 100644 --- a/main/models.py +++ b/main/models.py @@ -234,9 +234,11 @@ class Package(models.Model): list slim by including the corresponding package in the same testing category as this package if that check makes sense. """ + provides = set(self.provides.values_list('name', flat=True)) + provides.add(self.pkgname) requiredby = PackageDepend.objects.select_related('pkg', 'pkg__arch', 'pkg__repo').filter( - depname=self.pkgname).order_by( + depname__in=provides).order_by( 'pkg__pkgname', 'pkg__arch__name', 'pkg__repo__name') if not self.arch.agnostic: # make sure we match architectures if possible diff --git a/templates/packages/details.html b/templates/packages/details.html index 8be408fb..1016b43a 100644 --- a/templates/packages/details.html +++ b/templates/packages/details.html @@ -203,6 +203,7 @@ <ul> {% for req in rqdby %} <li>{% pkg_details_link req.pkg %} + {% if req.depname != pkg.pkgname %}<span class="virtual-dep">(requires {{ req.depname }})</span>{% endif %} {% if req.pkg.repo.testing %}<span class="testing-dep">(testing)</span>{% endif %} {% if req.optional %}<span class="opt-dep">(optional)</span>{% endif %} </li> |