From 89bc612b3f3f5f01e2a4239f6c4a36eb0b0ea655 Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Fri, 23 Mar 2012 20:53:42 -0500 Subject: reporead: use bulk_create() for more properties Depends, conflicts, provides, etc. can all be done via bulk_create. Signed-off-by: Dan McGee --- devel/management/commands/reporead.py | 30 +++++++++++++++++------------- 1 file changed, 17 insertions(+), 13 deletions(-) diff --git a/devel/management/commands/reporead.py b/devel/management/commands/reporead.py index 40329f95..c5a2ece5 100644 --- a/devel/management/commands/reporead.py +++ b/devel/management/commands/reporead.py @@ -158,7 +158,6 @@ def create_depend(package, dep_str, optional=False): logger.warning('Package %s had unparsable depend string %s', package.pkgname, dep_str) return None - depend.save(force_insert=True) return depend def create_related(model, package, rel_str, equals_only=False): @@ -180,7 +179,6 @@ def create_related(model, package, rel_str, equals_only=False): logger.warning('Package %s had unparsable %s string %s', package.pkgname, model.___name__, rel_str) return None - related.save(force_insert=True) return related def create_multivalued(dbpkg, repopkg, db_attr, repo_attr): @@ -190,8 +188,12 @@ def create_multivalued(dbpkg, repopkg, db_attr, repo_attr): done via getattr().''' collection = getattr(dbpkg, db_attr) collection.all().delete() + model = collection.model + new_items = [] for name in getattr(repopkg, repo_attr): - collection.create(name=name) + new_items.append(model(pkg=dbpkg, name=name)) + if new_items: + model.objects.bulk_create(new_items) finder = UserFinder() @@ -228,20 +230,22 @@ def populate_pkg(dbpkg, repopkg, force=False, timestamp=None): populate_files(dbpkg, repopkg, force=force) dbpkg.packagedepend_set.all().delete() - for y in repopkg.depends: - create_depend(dbpkg, y) - for y in repopkg.optdepends: - create_depend(dbpkg, y, True) + deps = [create_depend(dbpkg, y) for y in repopkg.depends] + deps += [create_depend(dbpkg, y, True) for y in repopkg.optdepends] + PackageDepend.objects.bulk_create(deps) dbpkg.conflicts.all().delete() - for y in repopkg.conflicts: - create_related(Conflict, dbpkg, y) + conflicts = [create_related(Conflict, dbpkg, y) for y in repopkg.conflicts] + Conflict.objects.bulk_create(conflicts) + dbpkg.provides.all().delete() - for y in repopkg.provides: - create_related(Provision, dbpkg, y, equals_only=True) + provides = [create_related(Provision, dbpkg, y, equals_only=True) + for y in repopkg.provides] + Provision.objects.bulk_create(provides) + dbpkg.replaces.all().delete() - for y in repopkg.replaces: - create_related(Replacement, dbpkg, y) + replaces = [create_related(Replacement, dbpkg, y) for y in repopkg.replaces] + Replacement.objects.bulk_create(replaces) create_multivalued(dbpkg, repopkg, 'groups', 'groups') create_multivalued(dbpkg, repopkg, 'licenses', 'license') -- cgit v1.1-4-g5e80 From bd12d14654ddc87c1b4d45dbc388cc13e883dbd6 Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Fri, 23 Mar 2012 21:18:31 -0500 Subject: Differentiate between Unsigned and unknown signer This can happen when we add a new developer but the key isn't in the system yet. Signed-off-by: Dan McGee --- templates/packages/details.html | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/templates/packages/details.html b/templates/packages/details.html index be7da7be..bbbef2eb 100644 --- a/templates/packages/details.html +++ b/templates/packages/details.html @@ -148,12 +148,15 @@ Build Date: {{ pkg.build_date|date:"DATETIME_FORMAT" }} UTC - - Signed By: - {% with pkg.signer as signer %}{% if signer %}{% pgp_key_link pkg.signature.key_id signer.get_full_name %}{% else %}Unsigned{% endif %}{% endwith %} {% if pkg.signature %} + Signed By: + {% with pkg.signer as signer %}{% if signer %}{% pgp_key_link pkg.signature.key_id signer.get_full_name %}{% else %}Unknown{% endif %}{% endwith %} + Signature Date: {{ pkg.signature.datetime|date:"DATETIME_FORMAT" }} UTC + {% else %} + Signed By: + Unsigned {% endif %} Last Updated: {{ pkg.last_update|date }} -- cgit v1.1-4-g5e80 From 837427f33ba0d1745849d1f3335e19e23b641023 Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Fri, 23 Mar 2012 21:22:19 -0500 Subject: Fix svg rendering window height For reference, FF changed behavior: https://bugzilla.mozilla.org/show_bug.cgi?id=738862 Signed-off-by: Dan McGee --- sitestatic/archweb.css | 1 + 1 file changed, 1 insertion(+) diff --git a/sitestatic/archweb.css b/sitestatic/archweb.css index 1a9d03bd..d2286329 100644 --- a/sitestatic/archweb.css +++ b/sitestatic/archweb.css @@ -993,6 +993,7 @@ ul.signoff-list { #visualize-keys svg { width: 100%; + height: 100%; } #visualize-keys circle { -- cgit v1.1-4-g5e80 From 012dd8418fd0d3b2b95a15474985104dfd547dc5 Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Fri, 23 Mar 2012 21:29:12 -0500 Subject: Change default SVN URL Signed-off-by: Dan McGee --- settings.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/settings.py b/settings.py index e1d4d4a9..10dc48e2 100644 --- a/settings.py +++ b/settings.py @@ -135,7 +135,7 @@ PXEBOOT_URL = 'http://releng.archlinux.org/pxeboot/' # URL for SVN access for fetching commit messages (note absence of packages or # community bit on the end, repo.svn_root is appended) -SVN_BASE_URL = 'svn+ssh://svn.archlinux.org/srv/svn-' +SVN_BASE_URL = 'svn://svn.archlinux.org/' ## Import local settings from local_settings import * -- cgit v1.1-4-g5e80 From 3451b4f8354e3478a604bb3e4805ac9e5982fecd Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Sat, 24 Mar 2012 12:11:43 -0500 Subject: Add favicon retro resources and correctly link them Signed-off-by: Dan McGee --- retro/static/2005/favicon.ico | Bin 0 -> 984 bytes retro/static/2006/favicon.ico | Bin 0 -> 984 bytes retro/static/2007/favicon.ico | Bin 0 -> 4286 bytes retro/static/2008/favicon.ico | Bin 0 -> 1150 bytes retro/static/2009/favicon.ico | Bin 0 -> 575 bytes retro/static/2010/favicon.ico | Bin 0 -> 575 bytes retro/static/2011/favicon.ico | Bin 0 -> 575 bytes retro/templates/retro/index-20050328.html | 2 +- retro/templates/retro/index-20060328.html | 2 +- retro/templates/retro/index-20070324.html | 4 ++-- retro/templates/retro/index-20080311.html | 4 ++-- retro/templates/retro/index-20090327.html | 4 ++-- retro/templates/retro/index-20100208.html | 4 ++-- retro/templates/retro/index-20110212.html | 4 ++-- 14 files changed, 12 insertions(+), 12 deletions(-) create mode 100644 retro/static/2005/favicon.ico create mode 100644 retro/static/2006/favicon.ico create mode 100644 retro/static/2007/favicon.ico create mode 100644 retro/static/2008/favicon.ico create mode 100644 retro/static/2009/favicon.ico create mode 100644 retro/static/2010/favicon.ico create mode 100644 retro/static/2011/favicon.ico diff --git a/retro/static/2005/favicon.ico b/retro/static/2005/favicon.ico new file mode 100644 index 00000000..a9f4e837 Binary files /dev/null and b/retro/static/2005/favicon.ico differ diff --git a/retro/static/2006/favicon.ico b/retro/static/2006/favicon.ico new file mode 100644 index 00000000..a9f4e837 Binary files /dev/null and b/retro/static/2006/favicon.ico differ diff --git a/retro/static/2007/favicon.ico b/retro/static/2007/favicon.ico new file mode 100644 index 00000000..e4d5d086 Binary files /dev/null and b/retro/static/2007/favicon.ico differ diff --git a/retro/static/2008/favicon.ico b/retro/static/2008/favicon.ico new file mode 100644 index 00000000..3a6d2ab9 Binary files /dev/null and b/retro/static/2008/favicon.ico differ diff --git a/retro/static/2009/favicon.ico b/retro/static/2009/favicon.ico new file mode 100644 index 00000000..55497b85 Binary files /dev/null and b/retro/static/2009/favicon.ico differ diff --git a/retro/static/2010/favicon.ico b/retro/static/2010/favicon.ico new file mode 100644 index 00000000..55497b85 Binary files /dev/null and b/retro/static/2010/favicon.ico differ diff --git a/retro/static/2011/favicon.ico b/retro/static/2011/favicon.ico new file mode 100644 index 00000000..55497b85 Binary files /dev/null and b/retro/static/2011/favicon.ico differ diff --git a/retro/templates/retro/index-20050328.html b/retro/templates/retro/index-20050328.html index e2d3058f..2ac8c580 100644 --- a/retro/templates/retro/index-20050328.html +++ b/retro/templates/retro/index-20050328.html @@ -4,7 +4,7 @@ - + diff --git a/retro/templates/retro/index-20060328.html b/retro/templates/retro/index-20060328.html index 840974c0..6f39c0ed 100644 --- a/retro/templates/retro/index-20060328.html +++ b/retro/templates/retro/index-20060328.html @@ -6,7 +6,7 @@ - +
diff --git a/retro/templates/retro/index-20070324.html b/retro/templates/retro/index-20070324.html index be4cedaf..c4739927 100644 --- a/retro/templates/retro/index-20070324.html +++ b/retro/templates/retro/index-20070324.html @@ -3,8 +3,8 @@ Arch Linux - - + + diff --git a/retro/templates/retro/index-20080311.html b/retro/templates/retro/index-20080311.html index 95c88b74..d48a632e 100644 --- a/retro/templates/retro/index-20080311.html +++ b/retro/templates/retro/index-20080311.html @@ -3,8 +3,8 @@ Arch Linux - - + + diff --git a/retro/templates/retro/index-20090327.html b/retro/templates/retro/index-20090327.html index b65c59f9..70c64736 100644 --- a/retro/templates/retro/index-20090327.html +++ b/retro/templates/retro/index-20090327.html @@ -3,8 +3,8 @@ Arch Linux - - + + diff --git a/retro/templates/retro/index-20100208.html b/retro/templates/retro/index-20100208.html index 5189037b..1d488248 100644 --- a/retro/templates/retro/index-20100208.html +++ b/retro/templates/retro/index-20100208.html @@ -3,8 +3,8 @@ Arch Linux - - + + diff --git a/retro/templates/retro/index-20110212.html b/retro/templates/retro/index-20110212.html index 88c9664f..e304a727 100644 --- a/retro/templates/retro/index-20110212.html +++ b/retro/templates/retro/index-20110212.html @@ -4,8 +4,8 @@ - - + + -- cgit v1.1-4-g5e80