summaryrefslogtreecommitdiff
path: root/mirrors
diff options
context:
space:
mode:
authorLuke Shumaker <LukeShu@sbcglobal.net>2013-11-28 19:55:53 -0500
committerLuke Shumaker <LukeShu@sbcglobal.net>2013-11-28 19:55:53 -0500
commitb2b6c78e3179cef66cd4e9dcea7f9003f409ce8b (patch)
tree2355b55efce971b6c7044b1f04b4a3730d2da50f /mirrors
parent0877f0389f187cf2cbf026c73b27071857d3e6f7 (diff)
parentfab8d437929fce202b11707e1cacbc079f61edbc (diff)
Merge tag 'release_2013-11-25' into archweb-generic
Django 1.6 upgrade and other changes Conflicts: templates/news/list.html templates/public/index.html
Diffstat (limited to 'mirrors')
-rw-r--r--mirrors/admin.py6
-rw-r--r--mirrors/management/commands/mirrorcheck.py2
2 files changed, 7 insertions, 1 deletions
diff --git a/mirrors/admin.py b/mirrors/admin.py
index d0f2f475..e35d9ce7 100644
--- a/mirrors/admin.py
+++ b/mirrors/admin.py
@@ -10,6 +10,7 @@ from .models import (Mirror, MirrorProtocol, MirrorUrl, MirrorRsync,
class MirrorUrlForm(forms.ModelForm):
class Meta:
model = MirrorUrl
+ fields = ('url', 'country', 'active')
def clean_url(self):
# is this a valid-looking URL?
@@ -39,6 +40,7 @@ class MirrorUrlInlineAdmin(admin.TabularInline):
class MirrorRsyncForm(forms.ModelForm):
class Meta:
model = MirrorRsync
+ fields = ('ip',)
class MirrorRsyncInlineAdmin(admin.TabularInline):
@@ -50,6 +52,10 @@ class MirrorRsyncInlineAdmin(admin.TabularInline):
class MirrorAdminForm(forms.ModelForm):
class Meta:
model = Mirror
+ fields = ('name', 'tier', 'upstream', 'admin_email', 'alternate_email',
+ 'public', 'active', 'isos', 'rsync_user', 'rsync_password',
+ 'notes')
+
upstream = forms.ModelChoiceField(
queryset=Mirror.objects.filter(tier__gte=0, tier__lte=1),
required=False)
diff --git a/mirrors/management/commands/mirrorcheck.py b/mirrors/management/commands/mirrorcheck.py
index 3f026c36..e48aa42e 100644
--- a/mirrors/management/commands/mirrorcheck.py
+++ b/mirrors/management/commands/mirrorcheck.py
@@ -241,7 +241,7 @@ class MirrorCheckPool(object):
thread.daemon = True
self.threads.append(thread)
- @transaction.commit_on_success
+ @transaction.atomic
def run(self):
logger.debug("starting threads")
for thread in self.threads: