From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.77) (envelope-from ) id 1Ss0Uk-0002ZO-1T for garchives@archives.gentoo.org; Thu, 19 Jul 2012 23:50:58 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 0D43BE06B1; Thu, 19 Jul 2012 23:50:15 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id D4355E06B1 for ; Thu, 19 Jul 2012 23:50:15 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 1CA611B404E for ; Thu, 19 Jul 2012 23:50:15 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 9F39FE543E for ; Thu, 19 Jul 2012 23:50:12 +0000 (UTC) From: "Slava Bacherikov" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Slava Bacherikov" Message-ID: <1342709501.5f676d86124b2e93be99ecf91077b5acee2c5b9e.bacher09@gentoo> Subject: [gentoo-commits] proj/gentoo-packages:master commit in: gpackages/apps/packages/, gpackages/templates/ X-VCS-Repository: proj/gentoo-packages X-VCS-Files: gpackages/apps/packages/views.py gpackages/templates/package_object.html X-VCS-Directories: gpackages/apps/packages/ gpackages/templates/ X-VCS-Committer: bacher09 X-VCS-Committer-Name: Slava Bacherikov X-VCS-Revision: 5f676d86124b2e93be99ecf91077b5acee2c5b9e X-VCS-Branch: master Date: Thu, 19 Jul 2012 23:50:12 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: b8c4b4e9-b4bb-41c2-af7c-f7f95d85aeb4 X-Archives-Hash: 1df9acde5905ec3e78f4a424e02f535d commit: 5f676d86124b2e93be99ecf91077b5acee2c5b9e Author: Slava Bacherikov bacher09 org> AuthorDate: Thu Jul 19 14:51:41 2012 +0000 Commit: Slava Bacherikov bacherikov org ua> CommitDate: Thu Jul 19 14:51:41 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/gentoo-packag= es.git;a=3Dcommit;h=3D5f676d86 Show description from ebuild if package don't have description in metadat= a --- gpackages/apps/packages/views.py | 1 - gpackages/templates/package_object.html | 2 ++ 2 files changed, 2 insertions(+), 1 deletions(-) diff --git a/gpackages/apps/packages/views.py b/gpackages/apps/packages/v= iews.py index be0ad02..cd209e4 100644 --- a/gpackages/apps/packages/views.py +++ b/gpackages/apps/packages/views.py @@ -136,7 +136,6 @@ class PackagesListsView(MultipleFilterListViewMixin, = ContextArchListView): select_related('virtual_package', 'virtual_package__category'). \ prefetch_related('repository', 'herds', 'maintainers') - #prefetch_keywords(['sparc-solaris', 'sparc64-solaris']) =20 class PackageDetailView(ArchesContexView, DetailView): template_name =3D 'package.html' diff --git a/gpackages/templates/package_object.html b/gpackages/template= s/package_object.html index 189d9bd..e1518b1 100644 --- a/gpackages/templates/package_object.html +++ b/gpackages/templates/package_object.html @@ -7,6 +7,8 @@ {% if package.description %}
{{ package.des= cription }}
+ {% elif package.short_description %} +
{{ package.sho= rt_description }}
{% endif %} {% render_keywords_table package arches %} =20