Merge tag 'release_2013-11-25' into archweb-generic

Django 1.6 upgrade and other changes

Conflicts:
	templates/news/list.html
	templates/public/index.html

8 files changed, 172 insertions, 36 deletions

diff --git a/devel/admin.py b/devel/admin.py
index 971933b7..c8f80f95 100644
--- a/devel/admin.py
+++ b/devel/admin.py
@@ -29,8 +29,7 @@ class DeveloperKeyAdmin(admin.ModelAdmin):
 
 
 class PGPSignatureAdmin(admin.ModelAdmin):
-    list_display = ('signer', 'signee', 'created', 'expires', 'valid')
-    list_filter = ('valid',)
+    list_display = ('signer', 'signee', 'created', 'expires', 'revoked')
     search_fields = ('signer', 'signee')
     date_hierarchy = 'created'
 
diff --git a/devel/management/commands/pgp_import.py b/devel/management/commands/pgp_import.py
index b1f29d77..3f557fe9 100644
--- a/devel/management/commands/pgp_import.py
+++ b/devel/management/commands/pgp_import.py
@@ -134,7 +134,7 @@ def import_keys(keyring):
 
     logger.info("creating or finding %d keys", len(keydata))
     created_ct = updated_ct = 0
-    with transaction.commit_on_success():
+    with transaction.atomic():
         finder = UserFinder()
         # we are dependent on parents coming before children; parse_keydata
         # uses an OrderedDict to ensure this is the case.
@@ -176,8 +176,13 @@ def import_keys(keyring):
     logger.info("created %d, updated %d keys", created_ct, updated_ct)
 
 
-SignatureData = namedtuple('SignatureData',
-        ('signer', 'signee', 'created', 'expires', 'valid'))
+class SignatureData(object):
+    def __init__(self, signer, signee, created):
+        self.signer = signer
+        self.signee = signee
+        self.created = created
+        self.expires = None
+        self.revoked = None
 
 
 def parse_sigdata(data):
@@ -192,21 +197,26 @@ def parse_sigdata(data):
         if parts[0] == 'pub':
             current_pubkey = parts[4]
             nodes[current_pubkey] = None
-        if parts[0] == 'uid':
+        elif parts[0] == 'uid':
             uid = parts[9]
             # only set uid if this is the first one encountered
             if nodes[current_pubkey] is None:
                 nodes[current_pubkey] = uid
-        if parts[0] == 'sig':
+        elif parts[0] == 'sig':
             signer = parts[4]
             created = get_date(parts[5])
-            expires = None
+            edge = SignatureData(signer, current_pubkey, created)
             if parts[6]:
-                expires = get_date(parts[6])
-            valid = parts[1] != '-'
-            edge = SignatureData(signer, current_pubkey,
-                    created, expires, valid)
+                edge.expires = get_date(parts[6])
             edges.append(edge)
+        elif parts[0] == 'rev':
+            signer = parts[4]
+            revoked = get_date(parts[5])
+            # revoke any prior edges that match
+            matches = [e for e in edges if e.signer == signer
+                    and e.signee == current_pubkey]
+            for edge in matches:
+                edge.revoked = revoked
 
     return nodes, edges
 
@@ -220,18 +230,18 @@ def import_signatures(keyring):
     pruned_edges = {edge for edge in edges
             if edge.signer in nodes and edge.signer != edge.signee}
 
-    logger.info("creating or finding %d signatures", len(pruned_edges))
+    logger.info("creating or finding up to %d signatures", len(pruned_edges))
     created_ct = updated_ct = 0
-    with transaction.commit_on_success():
+    with transaction.atomic():
         for edge in pruned_edges:
             sig, created = PGPSignature.objects.get_or_create(
                     signer=edge.signer, signee=edge.signee,
                     created=edge.created, expires=edge.expires,
-                    defaults={ 'valid': edge.valid })
-            if sig.valid != edge.valid:
-                sig.valid = edge.valid
+                    defaults={ 'revoked': edge.revoked })
+            if sig.revoked != edge.revoked:
+                sig.revoked = edge.revoked
                 sig.save()
-                updated_ct = 1
+                updated_ct += 1
             if created:
                 created_ct += 1
 
diff --git a/devel/management/commands/rematch_developers.py b/devel/management/commands/rematch_developers.py
index 2b379588..7a06e084 100644
--- a/devel/management/commands/rematch_developers.py
+++ b/devel/management/commands/rematch_developers.py
@@ -44,7 +44,7 @@ class Command(NoArgsCommand):
         match_packager(finder)
         match_flagrequest(finder)
 
-@transaction.commit_on_success
+@transaction.atomic
 def match_packager(finder):
     logger.info("getting all unmatched packager strings")
     package_count = matched_count = 0
@@ -70,7 +70,7 @@ def match_packager(finder):
             package_count, matched_count)
 
 
-@transaction.commit_on_success
+@transaction.atomic
 def match_flagrequest(finder):
     logger.info("getting all flag request email addresses from unknown users")
     req_count = matched_count = 0
diff --git a/devel/management/commands/reporead.py b/devel/management/commands/reporead.py
index 3e835f7c..8b591aeb 100644
--- a/devel/management/commands/reporead.py
+++ b/devel/management/commands/reporead.py
@@ -13,6 +13,7 @@ Example:
   ./manage.py reporead i686 /tmp/core.db.tar.gz
 """
 
+from base64 import b64decode
 from collections import defaultdict
 from copy import copy
 import io
@@ -140,8 +141,8 @@ DEPEND_RE = re.compile(r"^(.+?)((>=|<=|=|>|<)(.+))?$")
 
 def create_depend(package, dep_str, deptype='D'):
     depend = Depend(pkg=package, deptype=deptype)
-    # lop off any description first
-    parts = dep_str.split(':', 1)
+    # lop off any description first, don't get confused by epoch
+    parts = dep_str.split(': ', 1)
     if len(parts) > 1:
         depend.description = parts[1].strip()
     match = DEPEND_RE.match(parts[0].strip())
@@ -222,7 +223,7 @@ def populate_pkg(dbpkg, repopkg, force=False, timestamp=None):
     dbpkg.packager_str = repopkg.packager
     # attempt to find the corresponding django user for this string
     dbpkg.packager = finder.find(repopkg.packager)
-    dbpkg.pgp_signature = repopkg.pgpsig
+    dbpkg.signature_bytes = b64decode(repopkg.pgpsig.encode('utf-8'))
 
     if timestamp:
         dbpkg.last_update = timestamp
@@ -307,7 +308,7 @@ def update_common(archname, reponame, pkgs, sanity_check=True):
     # If isolation level is repeatable-read, we need to ensure each package
     # update starts a new transaction and re-queries the database as
     # necessary to guard against simultaneous updates.
-    with transaction.commit_on_success():
+    with transaction.atomic():
         # force the transaction dirty, even though we will only do reads
         transaction.set_dirty()
 
@@ -370,7 +371,7 @@ def db_update(archname, reponame, pkgs, force=False):
         dbpkg = Package(pkgname=pkg.name, arch=architecture, repo=repository,
                 created=timestamp)
         try:
-            with transaction.commit_on_success():
+            with transaction.atomic():
                 populate_pkg(dbpkg, pkg, timestamp=timestamp)
                 Update.objects.log_update(None, dbpkg)
         except IntegrityError:
@@ -385,7 +386,7 @@ def db_update(archname, reponame, pkgs, force=False):
     for pkgname in (dbset - syncset):
         logger.info("Removing package %s", pkgname)
         dbpkg = dbdict[pkgname]
-        with transaction.commit_on_success():
+        with transaction.atomic():
             Update.objects.log_update(dbpkg, None)
             # no race condition here as long as simultaneous threads both
             # issue deletes; second delete will be a no-op
@@ -408,7 +409,7 @@ def db_update(archname, reponame, pkgs, force=False):
         # The odd select_for_update song and dance here are to ensure
         # simultaneous updates don't happen on a package, causing
         # files/depends/all related items to be double-imported.
-        with transaction.commit_on_success():
+        with transaction.atomic():
             dbpkg = Package.objects.select_for_update().get(id=dbpkg.id)
             if not force and pkg_same_version(pkg, dbpkg):
                 logger.debug("Package %s was already updated", pkg.name)
@@ -436,7 +437,7 @@ def filesonly_update(archname, reponame, pkgs, force=False):
         # The odd select_for_update song and dance here are to ensure
         # simultaneous updates don't happen on a package, causing
         # files to be double-imported.
-        with transaction.commit_on_success():
+        with transaction.atomic():
             if not dbpkg.files_last_update or not dbpkg.last_update:
                 pass
             elif not force and dbpkg.files_last_update >= dbpkg.last_update:
diff --git a/devel/management/commands/reporead_inotify.py b/devel/management/commands/reporead_inotify.py
index 6aa4e0e0..e3c720bc 100644
--- a/devel/management/commands/reporead_inotify.py
+++ b/devel/management/commands/reporead_inotify.py
@@ -66,7 +66,7 @@ class Command(BaseCommand):
             if hasattr(thread, 'cancel'):
                 thread.cancel()
 
-    @transaction.commit_on_success
+    @transaction.atomic
     def setup_notifier(self):
         '''Set up and configure the inotify machinery and logic.
         This takes the provided or default path_template and builds a list of
diff --git a/devel/migrations/0011_auto__del_field_pgpsignature_valid__add_field_pgpsignature_revoked.py b/devel/migrations/0011_auto__del_field_pgpsignature_valid__add_field_pgpsignature_revoked.py
new file mode 100644
index 00000000..a2df917f
--- /dev/null
+++ b/devel/migrations/0011_auto__del_field_pgpsignature_valid__add_field_pgpsignature_revoked.py
@@ -0,0 +1,125 @@
+# -*- coding: utf-8 -*-
+import datetime
+from south.db import db
+from south.v2 import SchemaMigration
+from django.db import models
+
+
+class Migration(SchemaMigration):
+
+    def forwards(self, orm):
+        db.delete_column(u'devel_pgpsignature', 'valid')
+        db.add_column(u'devel_pgpsignature', 'revoked',
+                      self.gf('django.db.models.fields.DateField')(null=True, blank=True),
+                      keep_default=False)
+
+
+    def backwards(self, orm):
+        db.add_column(u'devel_pgpsignature', 'valid',
+                      self.gf('django.db.models.fields.BooleanField')(default=True),
+                      keep_default=True)
+        db.delete_column(u'devel_pgpsignature', 'revoked')
+
+
+    models = {
+        u'auth.group': {
+            'Meta': {'object_name': 'Group'},
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),
+            'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})
+        },
+        u'auth.permission': {
+            'Meta': {'ordering': "(u'content_type__app_label', u'content_type__model', u'codename')", 'unique_together': "((u'content_type', u'codename'),)", 'object_name': 'Permission'},
+            'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['contenttypes.ContentType']"}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
+        },
+        u'auth.user': {
+            'Meta': {'object_name': 'User'},
+            'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
+            'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+            'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+            'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
+            'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}),
+            'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})
+        },
+        u'contenttypes.contenttype': {
+            'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},
+            'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
+        },
+        u'devel.developerkey': {
+            'Meta': {'object_name': 'DeveloperKey'},
+            'created': ('django.db.models.fields.DateTimeField', [], {}),
+            'expires': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'key': ('devel.fields.PGPKeyField', [], {'unique': 'True', 'max_length': '40'}),
+            'owner': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'all_keys'", 'null': 'True', 'to': u"orm['auth.User']"}),
+            'parent': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['devel.DeveloperKey']", 'null': 'True', 'on_delete': 'models.SET_NULL'}),
+            'revoked': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'})
+        },
+        u'devel.masterkey': {
+            'Meta': {'ordering': "('created',)", 'object_name': 'MasterKey'},
+            'created': ('django.db.models.fields.DateField', [], {}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'owner': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'masterkey_owner'", 'to': u"orm['auth.User']"}),
+            'pgp_key': ('devel.fields.PGPKeyField', [], {'max_length': '40'}),
+            'revoked': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}),
+            'revoker': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'masterkey_revoker'", 'to': u"orm['auth.User']"})
+        },
+        u'devel.pgpsignature': {
+            'Meta': {'ordering': "('signer', 'signee')", 'object_name': 'PGPSignature'},
+            'created': ('django.db.models.fields.DateField', [], {}),
+            'expires': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'revoked': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}),
+            'signee': ('devel.fields.PGPKeyField', [], {'max_length': '40', 'db_index': 'True'}),
+            'signer': ('devel.fields.PGPKeyField', [], {'max_length': '40', 'db_index': 'True'})
+        },
+        u'devel.userprofile': {
+            'Meta': {'object_name': 'UserProfile', 'db_table': "'user_profiles'"},
+            'alias': ('django.db.models.fields.CharField', [], {'max_length': '50'}),
+            'allowed_repos': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['main.Repo']", 'symmetrical': 'False', 'blank': 'True'}),
+            'country': ('django_countries.fields.CountryField', [], {'max_length': '2', 'blank': 'True'}),
+            'favorite_distros': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'interests': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
+            'languages': ('django.db.models.fields.CharField', [], {'max_length': '50', 'null': 'True', 'blank': 'True'}),
+            'last_modified': ('django.db.models.fields.DateTimeField', [], {}),
+            'latin_name': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
+            'location': ('django.db.models.fields.CharField', [], {'max_length': '50', 'null': 'True', 'blank': 'True'}),
+            'notify': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'occupation': ('django.db.models.fields.CharField', [], {'max_length': '50', 'null': 'True', 'blank': 'True'}),
+            'other_contact': ('django.db.models.fields.CharField', [], {'max_length': '100', 'null': 'True', 'blank': 'True'}),
+            'pgp_key': ('devel.fields.PGPKeyField', [], {'max_length': '40', 'null': 'True', 'blank': 'True'}),
+            'picture': ('django.db.models.fields.files.FileField', [], {'default': "'devs/silhouette.png'", 'max_length': '100'}),
+            'public_email': ('django.db.models.fields.CharField', [], {'max_length': '50'}),
+            'roles': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
+            'time_zone': ('django.db.models.fields.CharField', [], {'default': "'UTC'", 'max_length': '100'}),
+            'user': ('django.db.models.fields.related.OneToOneField', [], {'related_name': "'userprofile'", 'unique': 'True', 'to': u"orm['auth.User']"}),
+            'website': ('django.db.models.fields.CharField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
+            'yob': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'})
+        },
+        u'main.repo': {
+            'Meta': {'ordering': "('name',)", 'object_name': 'Repo', 'db_table': "'repos'"},
+            'bugs_category': ('django.db.models.fields.SmallIntegerField', [], {'default': '2'}),
+            'bugs_project': ('django.db.models.fields.SmallIntegerField', [], {'default': '1'}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255'}),
+            'staging': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'svn_root': ('django.db.models.fields.CharField', [], {'max_length': '64'}),
+            'testing': ('django.db.models.fields.BooleanField', [], {'default': 'False'})
+        }
+    }
+
+    complete_apps = ['devel']
diff --git a/devel/models.py b/devel/models.py
index bf979338..44bbc66e 100644
--- a/devel/models.py
+++ b/devel/models.py
@@ -107,7 +107,7 @@ class PGPSignature(models.Model):
             db_index=True)
     created = models.DateField()
     expires = models.DateField(null=True, blank=True)
-    valid = models.BooleanField(default=True)
+    revoked = models.DateField(null=True, blank=True)
 
     class Meta:
         ordering = ('signer', 'signee')
diff --git a/devel/views.py b/devel/views.py
index 378d6d57..29954b51 100644
--- a/devel/views.py
+++ b/devel/views.py
@@ -20,7 +20,7 @@ from django.utils.http import http_date
 from django.utils.timezone import now
 
 from .forms import ProfileForm, UserProfileForm, NewUserForm
-from .models import DeveloperKey
+from .models import DeveloperKey, UserProfile
 from main.models import Package, PackageFile
 from main.models import Arch, Repo
 from news.models import News
@@ -158,21 +158,22 @@ def clock(request):
 @login_required
 @never_cache
 def change_profile(request):
+    profile, _ = UserProfile.objects.get_or_create(user=request.user)
     if request.POST:
         form = ProfileForm(request.POST)
         profile_form = UserProfileForm(request.POST, request.FILES,
-                instance=request.user.userprofile)
+                instance=profile)
         if form.is_valid() and profile_form.is_valid():
             request.user.email = form.cleaned_data['email']
             if form.cleaned_data['passwd1']:
                 request.user.set_password(form.cleaned_data['passwd1'])
-            with transaction.commit_on_success():
+            with transaction.atomic():
                 request.user.save()
                 profile_form.save()
             return HttpResponseRedirect('/devel/')
     else:
         form = ProfileForm(initial={'email': request.user.email})
-        profile_form = UserProfileForm(instance=request.user.userprofile)
+        profile_form = UserProfileForm(instance=profile)
     return render(request, 'devel/profile.html',
             {'form': form, 'profile_form': profile_form})
 
@@ -274,7 +275,7 @@ def report(request, report_name, username=None):
         cutoff = timedelta(hours=24)
         filtered = []
         packages = packages.select_related(
-                'arch', 'repo', 'packager').filter(pgp_signature__isnull=False)
+                'arch', 'repo', 'packager').filter(signature_bytes__isnull=False)
         known_keys = DeveloperKey.objects.select_related(
                 'owner').filter(owner__isnull=False)
         known_keys = {dk.key: dk for dk in known_keys}
@@ -334,7 +335,7 @@ def new_user_form(request):
     if request.POST:
         form = NewUserForm(request.POST)
         if form.is_valid():
-            with transaction.commit_on_success():
+            with transaction.atomic():
                 form.save()
                 log_addition(request, form.instance.user)
             return HttpResponseRedirect('/admin/auth/user/%d/' % \