Merge tag 'release_2012-02-11'

Quick release

Conflicts:
	requirements.txt
	requirements_prod.txt

2 files changed, 8 insertions, 3 deletions

diff --git a/packages/models.py b/packages/models.py
index f63d6db0..820e61ba 100644
--- a/packages/models.py
+++ b/packages/models.py
@@ -184,6 +184,9 @@ class FlagRequest(models.Model):
     is_legitimate = models.BooleanField(default=True,
             help_text="Is this actually an out-of-date flag request?")
 
+    class Meta:
+        get_latest_by = 'created'
+
     def who(self):
         if self.user:
             return self.user.get_full_name()
@@ -258,7 +261,7 @@ class Replacement(models.Model):
 
 
 # hook up some signals
-for sender in (PackageRelation, SignoffSpecification, Signoff, FlagRequest):
+for sender in (PackageRelation, SignoffSpecification, Signoff):
     pre_save.connect(set_created_field, sender=sender,
             dispatch_uid="packages.models")
 
diff --git a/packages/views/flag.py b/packages/views/flag.py
index f74a718a..ad1b04db 100644
--- a/packages/views/flag.py
+++ b/packages/views/flag.py
@@ -61,9 +61,11 @@ def flag(request, name, repo, arch):
 
             @transaction.commit_on_success
             def perform_updates():
-                pkgs.update(flag_date=datetime.utcnow())
+                now = datetime.utcnow()
+                pkgs.update(flag_date=now)
                 # store our flag request
-                flag_request = FlagRequest(user_email=email, message=message,
+                flag_request = FlagRequest(created=now,
+                        user_email=email, message=message,
                         ip_address=ip_addr, pkgbase=pkg.pkgbase,
                         version=version, repo=pkg.repo,
                         num_packages=len(flagged_pkgs))