Migrate flag request version info to new format

Signed-off-by: Dan McGee <dan@archlinux.org>

1 files changed, 6 insertions, 2 deletions

diff --git a/main/models.py b/main/models.py
index bb2320e8..95e3c42b 100644
--- a/main/models.py
+++ b/main/models.py
@@ -345,12 +345,16 @@ class Package(models.Model):
                 pkgbase=self.pkgbase).exclude(id=self.id)
 
     def flag_request(self):
-        if not self.flag_date:
+        if self.flag_date is None:
             return None
         from packages.models import FlagRequest
         try:
+            # Note that we don't match on pkgrel here; this is because a pkgrel
+            # bump does not unflag a package so we can still show the same flag
+            # request from a different pkgrel.
             request = FlagRequest.objects.filter(pkgbase=self.pkgbase,
-                    repo=self.repo).latest()
+                    repo=self.repo, pkgver=self.pkgver,
+                    epoch=self.epoch).latest()
             return request
         except FlagRequest.DoesNotExist:
             return None