Merge branch 'archweb-generic' into master-nomake

Conflicts:
	README.md

2 files changed, 6 insertions, 5 deletions

diff --git a/public/utils.py b/public/utils.py
index fcfd0f77..11091883 100644
--- a/public/utils.py
+++ b/public/utils.py
@@ -2,7 +2,7 @@ from collections import defaultdict
 from operator import attrgetter
 
 from main.models import Arch, Repo, Package
-from main.utils import cache_function, groupby_preserve_order, PackageStandin
+from main.utils import groupby_preserve_order, PackageStandin
 
 class RecentUpdate(object):
     def __init__(self, packages):
@@ -58,7 +58,6 @@ class RecentUpdate(object):
         return "RecentUpdate '%s %s' <%d packages>" % (
                 self.pkgbase, self.version, len(self.packages))
 
-@cache_function(62)
 def get_recent_updates(number=15, testing=True, staging=False):
     repos = Repo.objects.all()
     if not testing:
diff --git a/public/views.py b/public/views.py
index 92065e3a..f04f357b 100644
--- a/public/views.py
+++ b/public/views.py
@@ -20,12 +20,14 @@ from .utils import get_recent_updates
 @cache_control(max_age=300)
 def index(request):
     if request.user.is_authenticated():
-        pkgs = get_recent_updates(testing=True, staging=True)
+        def updates():
+            return get_recent_updates(testing=True, staging=True)
     else:
-        pkgs = get_recent_updates()
+        def updates():
+            return get_recent_updates()
     context = {
         'news_updates': News.objects.order_by('-postdate', '-id')[:15],
-        'pkg_updates': pkgs,
+        'pkg_updates': updates,
     }
     return render(request, 'public/index.html', context)