Merge tag 'release_2012-04-07'

I hate writing tag messages.

Conflicts:
	packages/templatetags/package_extras.py
	templates/packages/flag.html
	templates/packages/flaghelp.html
	templates/public/download.html
	templates/public/index.html
	templates/public/svn.html

2 files changed, 38 insertions, 2 deletions

diff --git a/devel/utils.py b/devel/utils.py
index ec035d13..85b4e42f 100644
--- a/devel/utils.py
+++ b/devel/utils.py
@@ -49,6 +49,7 @@ class UserFinder(object):
         self.cache = {}
         self.username_cache = {}
         self.email_cache = {}
+        self.pgp_cache = {}
 
     @staticmethod
     def user_email(name, email):
@@ -146,9 +147,25 @@ class UserFinder(object):
         self.email_cache[email] = user
         return user
 
+    def find_by_pgp_key(self, pgp_key):
+        if not pgp_key:
+            return None
+        if pgp_key in self.pgp_cache:
+            return self.pgp_cache[pgp_key]
+
+        try:
+            user = User.objects.get(
+                    userprofile__pgp_key__endswith=pgp_key)
+        except User.DoesNotExist:
+            user = None
+
+        self.pgp_cache[pgp_key] = user
+        return user
+
     def clear_cache(self):
         self.cache = {}
         self.username_cache = {}
         self.email_cache = {}
+        self.pgp_cache = {}
 
 # vim: set ts=4 sw=4 et:
diff --git a/devel/views.py b/devel/views.py
index f2c3949c..2b003bf7 100644
--- a/devel/views.py
+++ b/devel/views.py
@@ -1,4 +1,4 @@
-from datetime import datetime, timedelta
+from datetime import date, datetime, timedelta
 import operator
 import pytz
 import random
@@ -28,7 +28,7 @@ from main.utils import utc_now
 from packages.models import PackageRelation
 from packages.utils import get_signoff_groups
 from todolists.utils import get_annotated_todolists
-from .utils import get_annotated_maintainers
+from .utils import get_annotated_maintainers, UserFinder
 
 
 @login_required
@@ -232,6 +232,25 @@ def report(request, report_name, username=None):
         # The two separate calls to exclude is required to do the right thing
         packages = packages.exclude(pkgbase__in=owned).exclude(
                 pkgname__in=required)
+    elif report_name == 'mismatched-signature':
+        title = 'Packages with mismatched signatures'
+        names = [ 'Signature Date', 'Signed By', 'Packager' ]
+        attrs = [ 'sig_date', 'sig_by', 'packager' ]
+        cutoff = timedelta(hours=24)
+        finder = UserFinder()
+        filtered = []
+        packages = packages.filter(pgp_signature__isnull=False)
+        for package in packages:
+            sig_date = package.signature.datetime.replace(tzinfo=pytz.utc)
+            package.sig_date = sig_date.date()
+            key_id = package.signature.key_id
+            signer = finder.find_by_pgp_key(key_id)
+            package.sig_by = signer or key_id
+            if signer is None or signer.id != package.packager_id:
+                filtered.append(package)
+            elif sig_date > package.build_date + cutoff:
+                filtered.append(package)
+        packages = filtered
     else:
         raise Http404