summaryrefslogtreecommitdiffstats
path: root/mirrors/management
diff options
context:
space:
mode:
authorDan McGee <dan@archlinux.org>2013-06-01 02:21:47 +0200
committerDan McGee <dan@archlinux.org>2013-06-01 02:21:47 +0200
commite50471b9a7658f37b00aa3854d75a45007926802 (patch)
treeef31774ad11960b590dffa59c5bcf4d78c50c0dc /mirrors/management
parentbbeb9276051c2dc34f6d63fac4963343aacdf9b2 (diff)
downloadarchweb-e50471b9a7658f37b00aa3854d75a45007926802.tar.gz
archweb-e50471b9a7658f37b00aa3854d75a45007926802.tar.xz
Honor mirror URL active attribute in several places
Signed-off-by: Dan McGee <dan@archlinux.org>
Diffstat (limited to 'mirrors/management')
-rw-r--r--mirrors/management/commands/mirrorcheck.py2
-rw-r--r--mirrors/management/commands/mirrorresolv.py2
2 files changed, 2 insertions, 2 deletions
diff --git a/mirrors/management/commands/mirrorcheck.py b/mirrors/management/commands/mirrorcheck.py
index e7dd7b4..6faf294 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 a6c2523..85a3c65 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)