Flag lib32 out of date when non lib32 marked out of date

Author: lrustand

packages/views/flag.py

@@ -9,6 +9,8 @@
 from django.template import loader
 from django.utils.timezone import now
 from django.views.decorators.cache import cache_page, never_cache
+from django.db.models import Q
+from django.http import Http404
 
 from ..models import FlagRequest
 from main.models import Package
@@ -54,20 +56,39 @@ def flag(request, name, repo, arch):
     if pkg.flag_date is not None:
         # already flagged. do nothing.
         return render(request, 'packages/flagged.html', {'pkg': pkg})
-    # find all packages from (hopefully) the same PKGBUILD
-    pkgs = Package.objects.normal().filter(
-            pkgbase=pkg.pkgbase, flag_date__isnull=True,
+
+    # Find packages based on the same packagebase
+    pkg_filter = Q(pkgbase=pkg.pkgbase, flag_date__isnull=True,
             repo__testing=pkg.repo.testing,
-            repo__staging=pkg.repo.staging).order_by(
-            'pkgname', 'repo__name', 'arch__name')
+            repo__staging=pkg.repo.staging)
+
+    if "lib32-" in name:
+        # Find normal version of lib32 packages
+        non_lib32_pkg = get_object_or_404(Package.objects.normal(),
+                pkgname=name.replace("lib32-",""))
+        pkg_filter = pkg_filter | Q(pkgbase=non_lib32_pkg.pkgbase,
+                                    flag_date__isnull=True)
+    else:
+        # Find lib32 version of normal packages
+        try:
+            lib32_pkg = get_object_or_404(Package.objects.normal(),
+                    pkgname="lib32-"+pkg.pkgbase)
+            pkg_filter = pkg_filter | Q(pkgbase=lib32_pkg.pkgbase,
+                                        flag_date__isnull=True)
+        except Http404:
+            pass # Do not raise an error when there is no lib32 version
+
 
+
+    pkgs = Package.objects.normal().filter(pkg_filter).order_by(
+            'pkgname', 'repo__name', 'arch__name')
     authenticated = request.user.is_authenticated
 
     if request.POST:
         form = FlagForm(request.POST, authenticated=authenticated)
         if form.is_valid() and form.cleaned_data['website'] == '':
             # save the package list for later use
-            flagged_pkgs = list(pkgs)
+            flagged_pkgs = list(pkgs) + list(lib32_pkgs)
 
             # find a common version if there is one available to store
             versions = set((pkg.pkgver, pkg.pkgrel, pkg.epoch)