Merge branch 'archweb-generic2'

2 files changed, 2 insertions, 2 deletions

diff --git a/mirrors/management/commands/mirrorcheck.py b/mirrors/management/commands/mirrorcheck.py
index e7dd7b49..6faf294a 100644
--- a/mirrors/management/commands/mirrorcheck.py
+++ b/mirrors/management/commands/mirrorcheck.py
@@ -63,7 +63,7 @@ class Command(NoArgsCommand):
         timeout = options.get('timeout')
 
         urls = MirrorUrl.objects.select_related('protocol').filter(
-                mirror__active=True, mirror__public=True)
+                active=True, mirror__active=True, mirror__public=True)
 
         location = options.get('location', None)
         if location:
diff --git a/mirrors/management/commands/mirrorresolv.py b/mirrors/management/commands/mirrorresolv.py
index a6c2523e..85a3c654 100644
--- a/mirrors/management/commands/mirrorresolv.py
+++ b/mirrors/management/commands/mirrorresolv.py
@@ -39,7 +39,7 @@ class Command(NoArgsCommand):
 
 def resolve_mirrors():
     logger.debug("requesting list of mirror URLs")
-    for mirrorurl in MirrorUrl.objects.filter(mirror__active=True):
+    for mirrorurl in MirrorUrl.objects.filter(active=True, mirror__active=True):
         try:
             # save old values, we can skip no-op updates this way
             oldvals = (mirrorurl.has_ipv4, mirrorurl.has_ipv6)