Merge commit '3451b4f'

Conflicts:
	settings.py

18 files changed, 43 insertions, 28 deletions

diff --git a/devel/management/commands/reporead.py b/devel/management/commands/reporead.py
index 3eaa6110..57c8715a 100644
--- a/devel/management/commands/reporead.py
+++ b/devel/management/commands/reporead.py
@@ -160,7 +160,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):
@@ -182,7 +181,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):
@@ -192,8 +190,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()
 
@@ -233,20 +235,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')
diff --git a/retro/static/2005/favicon.ico b/retro/static/2005/favicon.ico
new file mode 100644
index 00000000..a9f4e837
--- /dev/null
+++ b/retro/static/2005/favicon.ico
diff --git a/retro/static/2006/favicon.ico b/retro/static/2006/favicon.ico
new file mode 100644
index 00000000..a9f4e837
--- /dev/null
+++ b/retro/static/2006/favicon.ico
diff --git a/retro/static/2007/favicon.ico b/retro/static/2007/favicon.ico
new file mode 100644
index 00000000..e4d5d086
--- /dev/null
+++ b/retro/static/2007/favicon.ico
diff --git a/retro/static/2008/favicon.ico b/retro/static/2008/favicon.ico
new file mode 100644
index 00000000..3a6d2ab9
--- /dev/null
+++ b/retro/static/2008/favicon.ico
diff --git a/retro/static/2009/favicon.ico b/retro/static/2009/favicon.ico
new file mode 100644
index 00000000..55497b85
--- /dev/null
+++ b/retro/static/2009/favicon.ico
diff --git a/retro/static/2010/favicon.ico b/retro/static/2010/favicon.ico
new file mode 100644
index 00000000..55497b85
--- /dev/null
+++ b/retro/static/2010/favicon.ico
diff --git a/retro/static/2011/favicon.ico b/retro/static/2011/favicon.ico
new file mode 100644
index 00000000..55497b85
--- /dev/null
+++ b/retro/static/2011/favicon.ico
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 @@
 <meta name="keywords" content="linux, linux distribution, arch, pacman, i686-optimized, distribution, open source, free, packages, server, daemon, network, systems">
 <link rel="stylesheet" type="text/css" href="{{ RETRO_STATIC_URL }}fonts.css">
 <link rel="stylesheet" type="text/css" href="{{ RETRO_STATIC_URL }}containers.css">
-<link rel="shortcut icon" href="http://web.archive.org/web/20050328032247im_/http://www.archlinux.org/favicon.ico">
+<link rel="shortcut icon" href="{{ RETRO_STATIC_URL }}favicon.ico">
 </head>
 <body>
 <table style="background-color: rgb(0, 0, 0); width: 100%;" cellspacing="0">
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 @@
 <link rel="stylesheet" type="text/css" href="{{ RETRO_STATIC_URL }}containers.css">
 <link rel="alternate" type="application/rss+xml" title="Arch Linux News Feed" href="http://web.archive.org/web/20060328003102/http://www.archlinux.org/rdf_news.php">
 <link rel="alternate" type="application/rss+xml" title="Arch Linux Package Updates" href="http://web.archive.org/web/20060328003102/http://www.archlinux.org/rdf_feed.php">
-<link rel="shortcut icon" href="http://web.archive.org/web/20060328003102im_/http://archlinux.org/favicon.ico">
+<link rel="shortcut icon" href="{{ RETRO_STATIC_URL }}favicon.ico">
 </head>
 <body>
 <table style="background-color: rgb(0, 0, 0); width: 100%;" cellspacing="0">
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 @@
 		<title>Arch Linux</title>
 		<meta http-equiv="content-type" content="text/html; charset=UTF-8">
 		<link rel="stylesheet" href="{{ RETRO_STATIC_URL }}arch.css">
-		<link rel="icon" href="http://web.archive.org/web/20070324064759/http://archlinux.org/media/favicon.ico" type="image/x-icon">
-		<link rel="shortcut icon" href="http://web.archive.org/web/20070324064759im_/http://archlinux.org/media/favicon.ico" type="image/x-icon">
+		<link rel="icon" href="{{ RETRO_STATIC_URL }}favicon.ico" type="image/x-icon">
+		<link rel="shortcut icon" href="{{ RETRO_STATIC_URL }}favicon.ico" type="image/x-icon">
 		
 <link rel="alternate" type="application/rss+xml" title="Arch Linux News Updates" href="http://web.archive.org/web/20070324064759/http://archlinux.org/feeds/news/">
 <link rel="alternate" type="application/rss+xml" title="Arch Linux Package Updates" href="http://web.archive.org/web/20070324064759/http://archlinux.org/feeds/packages/">
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 @@
         <title>Arch Linux</title>
         <meta http-equiv="content-type" content="text/html; charset=UTF-8">
         <link rel="stylesheet" href="{{ RETRO_STATIC_URL }}arch.css">
-        <link rel="icon" href="http://web.archive.org/web/20080311110003/http://www.archlinux.org/media/favicon.ico" type="image/x-icon">
-        <link rel="shortcut icon" href="http://web.archive.org/web/20080311110003im_/http://www.archlinux.org/media/favicon.ico" type="image/x-icon">
+        <link rel="icon" href="{{ RETRO_STATIC_URL }}favicon.ico" type="image/x-icon">
+        <link rel="shortcut icon" href="{{ RETRO_STATIC_URL }}favicon.ico" type="image/x-icon">
         
 <link rel="alternate" type="application/rss+xml" title="Arch Linux News Updates" href="http://web.archive.org/web/20080311110003/http://www.archlinux.org/feeds/news/">
 <link rel="alternate" type="application/rss+xml" title="Arch Linux Package Updates" href="http://web.archive.org/web/20080311110003/http://www.archlinux.org/feeds/packages/">
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 @@
         <title>Arch Linux</title>
         <meta http-equiv="content-type" content="text/html; charset=UTF-8">
         <link rel="stylesheet" href="{{ RETRO_STATIC_URL }}arch.css">
-        <link rel="icon" href="http://web.archive.org/web/20090327235558/http://www.archlinux.org/media/favicon.ico" type="image/x-icon">
-        <link rel="shortcut icon" href="http://web.archive.org/web/20090327235558im_/http://www.archlinux.org/media/favicon.ico" type="image/x-icon">
+        <link rel="icon" href="{{ RETRO_STATIC_URL }}favicon.ico" type="image/x-icon">
+        <link rel="shortcut icon" href="{{ RETRO_STATIC_URL }}favicon.ico" type="image/x-icon">
         
 <link rel="alternate" type="application/rss+xml" title="Arch Linux News Updates" href="http://web.archive.org/web/20090327235558/http://www.archlinux.org/feeds/news/">
 <link rel="alternate" type="application/rss+xml" title="Arch Linux Package Updates" href="http://web.archive.org/web/20090327235558/http://www.archlinux.org/feeds/packages/">
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 @@
         <title>Arch Linux</title>
         <meta http-equiv="content-type" content="text/html; charset=UTF-8">
         <link rel="stylesheet" type="text/css" href="{{ RETRO_STATIC_URL }}arch.css">
-        <link rel="icon" type="image/x-icon" href="http://web.archive.org/web/20100208061823/http://www.archlinux.org/media/favicon.ico">
-        <link rel="shortcut icon" type="image/x-icon" href="http://web.archive.org/web/20100208061823im_/http://www.archlinux.org/media/favicon.ico">
+        <link rel="icon" type="image/x-icon" href="{{ RETRO_STATIC_URL }}favicon.ico">
+        <link rel="shortcut icon" type="image/x-icon" href="{{ RETRO_STATIC_URL }}favicon.ico">
         
 <link rel="alternate" type="application/rss+xml" title="Arch Linux News Updates" href="http://web.archive.org/web/20100208061823/http://www.archlinux.org/feeds/news/">
 <link rel="alternate" type="application/rss+xml" title="Arch Linux Package Updates" href="http://web.archive.org/web/20100208061823/http://www.archlinux.org/feeds/packages/">
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 @@
     <meta http-equiv="content-type" content="text/html; charset=UTF-8">
     <link rel="stylesheet" type="text/css" href="{{ RETRO_STATIC_URL }}archweb.css" media="screen, projection">
     <link rel="stylesheet" type="text/css" href="{{ RETRO_STATIC_URL }}archweb-print.css" media="print">
-    <link rel="icon" type="image/x-icon" href="http://web.archive.org/web/20110212035546/http://www.archlinux.org/media/favicon.ico">
-    <link rel="shortcut icon" type="image/x-icon" href="http://web.archive.org/web/20110212035546im_/http://www.archlinux.org/media/favicon.ico">
+    <link rel="icon" type="image/x-icon" href="{{ RETRO_STATIC_URL }}favicon.ico">
+    <link rel="shortcut icon" type="image/x-icon" href="{{ RETRO_STATIC_URL }}favicon.ico">
     <link rel="search" type="application/opensearchdescription+xml" href="http://web.archive.org/web/20110212035546/http://www.archlinux.org/opensearch/packages/" title="Arch Linux Packages">
     
 <link rel="alternate" type="application/rss+xml" title="Arch Linux News Updates" href="http://web.archive.org/web/20110212035546/http://www.archlinux.org/feeds/news/">
diff --git a/settings.py b/settings.py
index 41571f43..735bf8b8 100644
--- a/settings.py
+++ b/settings.py
@@ -130,6 +130,13 @@ PGP_SERVER = 'pgp.mit.edu:11371'
 # URL to fetch a current list of available ISOs
 ISO_LIST_URL = 'https://repo.parabolagnulinux.org/isos/'
 
+# URL to the PXE netboot instructions
+PXEBOOT_URL = 'http://repo.parabolagnulinux.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://svn.archlinux.org/'
+
 ## Import local settings
 from local_settings import *
 
diff --git a/sitestatic/archweb.css b/sitestatic/archweb.css
index 5c9bb5de..180cb05a 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 {
diff --git a/templates/packages/details.html b/templates/packages/details.html
index ba731a7e..b1d9be6c 100644
--- a/templates/packages/details.html
+++ b/templates/packages/details.html
@@ -143,12 +143,15 @@
         </tr><tr>
             <th>Build Date:</th>
             <td>{{ pkg.build_date|date:"DATETIME_FORMAT" }} UTC</td>
-        </tr><tr>
-            <th>Signed By:</th>
-            <td>{% with pkg.signer as signer %}{% if signer %}{% pgp_key_link pkg.signature.key_id signer.get_full_name %}{% else %}Unsigned{% endif %}{% endwith %}</td>
         </tr>{% if pkg.signature %}<tr>
+            <th>Signed By:</th>
+            <td>{% with pkg.signer as signer %}{% if signer %}{% pgp_key_link pkg.signature.key_id signer.get_full_name %}{% else %}Unknown{% endif %}{% endwith %}</td>
+        </tr><tr>
             <th>Signature Date:</th>
             <td>{{ pkg.signature.datetime|date:"DATETIME_FORMAT" }} UTC</td>
+        </tr>{% else %}<tr>
+            <th>Signed By:</th>
+            <td>Unsigned</td>
         </tr>{% endif %}<tr>
             <th>Last Updated:</th>
             <td>{{ pkg.last_update|date }}</td>