From 230eef669823565ba9c2745f6a8c52a726eb3720 Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Wed, 7 Mar 2012 23:45:55 -0600 Subject: Exclude all compressed manpages Signed-off-by: Dan McGee --- devel/views.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/devel/views.py b/devel/views.py index 5f1aed54..d836bd78 100644 --- a/devel/views.py +++ b/devel/views.py @@ -212,7 +212,10 @@ def report(request, report_name, username=None): bad_files = PackageFile.objects.filter(is_directory=False, directory__contains='/man/', filename__regex=r'\.[0-9n]').exclude( - filename__endswith='.gz').exclude(filename__endswith='.html') + filename__endswith='.gz').exclude( + filename__endswith='.xz').exclude( + filename__endswith='.bz2').exclude( + filename__endswith='.html') if username: pkg_ids = set(packages.values_list('id', flat=True)) bad_files = bad_files.filter(pkg__in=pkg_ids) -- cgit v1.2.3 From 0ad6a96019d8a713726b468369b4a6ef184b3018 Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Thu, 10 Nov 2011 22:34:56 -0600 Subject: Tabs to spaces conversion Signed-off-by: Dan McGee --- main/migrations/0033_mark_any_agnostic.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/main/migrations/0033_mark_any_agnostic.py b/main/migrations/0033_mark_any_agnostic.py index 6ba59b43..4f429a2b 100644 --- a/main/migrations/0033_mark_any_agnostic.py +++ b/main/migrations/0033_mark_any_agnostic.py @@ -7,10 +7,10 @@ from django.db import models class Migration(DataMigration): def forwards(self, orm): - orm.Arch.objects.filter(name='any').update(agnostic=True) + orm.Arch.objects.filter(name='any').update(agnostic=True) def backwards(self, orm): - pass + pass models = { 'auth.group': { -- cgit v1.2.3 From 94be52f1bb320206524d2f0f4ad79968ca437727 Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Thu, 8 Mar 2012 00:25:32 -0600 Subject: Only show package groups if they exist Signed-off-by: Dan McGee --- templates/packages/details.html | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/templates/packages/details.html b/templates/packages/details.html index 2482d1aa..e0dd7034 100644 --- a/templates/packages/details.html +++ b/templates/packages/details.html @@ -108,26 +108,23 @@ License(s): {{ pkg.licenses.all|join:", " }} - + + {% with pkg.groups.all as groups %}{% if groups %} + Groups: - {% with pkg.groups.all as groups %} - {% if groups %} - {% for g in groups %} + {% for g in groups %} {{ g.name }}
{% endfor %} - {% else %}None{% endif %} - {% endwith %} - {% with pkg.provides.all as provides %} - {% if provides %} + {% endif %}{% endwith %} + {% with pkg.provides.all as provides %}{% if provides %} Provides: {% for p in provides %}{{ p.name }}{% if p.version %}={{ p.version }}{% endif %}
{% endfor %} - {% endif %} - {% endwith %} + {% endif %}{% endwith %} Maintainers: {% with pkg.maintainers as maints %} -- cgit v1.2.3 From 314608aee372c890031cd89f556327a93a2538e6 Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Thu, 8 Mar 2012 00:37:07 -0600 Subject: Allow more flexibility in pgp_key_link Allow key_id to be a large integer value that gets converted to hex, and allow overriding of the default link text. Signed-off-by: Dan McGee --- main/templatetags/pgp.py | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/main/templatetags/pgp.py b/main/templatetags/pgp.py index d69e2918..1ffc5241 100644 --- a/main/templatetags/pgp.py +++ b/main/templatetags/pgp.py @@ -16,17 +16,28 @@ def format_key(key_id): return u'0x%s' % key_id @register.simple_tag -def pgp_key_link(key_id): +def pgp_key_link(key_id, link_text=None): if not key_id: return "Unknown" + if isinstance(key_id, (int, long)): + key_id = '%X' % key_id + # zero-fill to nearest 8, 16, or 40 chars if necessary + if len(key_id) <= 8: + key_id = key_id.zfill(8) + elif len(key_id) <= 16: + key_id = key_id.zfill(16) + elif len(key_id) <= 40: + key_id = key_id.zfill(40) # Something like 'pgp.mit.edu:11371' pgp_server = getattr(settings, 'PGP_SERVER', None) if not pgp_server: return format_key(key_id) url = 'http://%s/pks/lookup?op=vindex&fingerprint=on&exact=on&search=0x%s' % \ (pgp_server, key_id) - values = (url, format_key(key_id), key_id[-8:]) - return '0x%s' % values + if link_text is None: + link_text = '0x%s' % key_id[-8:] + values = (url, format_key(key_id), link_text) + return '%s' % values @register.filter def pgp_fingerprint(key_id, autoescape=True): -- cgit v1.2.3