Merge branch 'archweb-generic2'

Conflicts:
	README.BRANDING
	local_settings.py.example
	packages/templatetags/package_extras.py
	public/views.py
	releng/views.py
	settings.py
	sitestatic/archnavbar/archnavbar.css
	sitestatic/silhouette.png
	templates/base.html
	templates/packages/differences.html
	templates/packages/opensearch.xml
	templates/packages/search.html
	templates/public/donate.html
	templates/public/download.html
	templates/public/feeds.html
	templates/public/index.html
	urls.py

1 files changed, 21 insertions, 6 deletions

diff --git a/public/utils.py b/public/utils.py
index a40c9b53..fcfd0f77 100644
--- a/public/utils.py
+++ b/public/utils.py
@@ -1,6 +1,7 @@
+from collections import defaultdict
 from operator import attrgetter
 
-from main.models import Arch, Package
+from main.models import Arch, Repo, Package
 from main.utils import cache_function, groupby_preserve_order, PackageStandin
 
 class RecentUpdate(object):
@@ -44,13 +45,27 @@ class RecentUpdate(object):
         else:
             # fake out the template- this is slightly hacky but yields one
             # 'package-like' object per arch which is what the normal loop does
-            arches = set()
+            by_arch = defaultdict(list)
             for package in self.others:
-                if package.arch not in arches and not arches.add(package.arch):
-                    yield PackageStandin(package)
+                by_arch[package.arch].append(package)
+            for arch, packages in by_arch.items():
+                if len(packages) == 1:
+                    yield packages[0]
+                else:
+                    yield PackageStandin(packages[0])
+
+    def __unicode__(self):
+        return "RecentUpdate '%s %s' <%d packages>" % (
+                self.pkgbase, self.version, len(self.packages))
 
 @cache_function(62)
-def get_recent_updates(number=15):
+def get_recent_updates(number=15, testing=True, staging=False):
+    repos = Repo.objects.all()
+    if not testing:
+        repos = repos.exclude(testing=True)
+    if not staging:
+        repos = repos.exclude(staging=True)
+
     # This is a bit of magic. We are going to show 15 on the front page, but we
     # want to try and eliminate cross-architecture wasted space. Pull enough
     # packages that we can later do some screening and trim out the fat.
@@ -59,7 +74,7 @@ def get_recent_updates(number=15):
     fetch = number * 6
     for arch in Arch.objects.all():
         pkgs += list(Package.objects.normal().filter(
-            arch=arch).order_by('-last_update')[:fetch])
+            arch=arch, repo__in=repos).order_by('-last_update')[:fetch])
     pkgs.sort(key=attrgetter('last_update'), reverse=True)
 
     same_pkgbase_key = lambda x: (x.repo.name, x.pkgbase)