diff options
| author | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2011-09-14 00:36:47 -0300 |
|---|---|---|
| committer | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2011-09-14 00:36:47 -0300 |
| commit | 60a1fc6cc4cef0b9eed58ea4f0ca003b76ec382a (patch) | |
| tree | 032ae62668538be964f57a12018d1ab9f696be5f /mirrors | |
| parent | fbd23db51b7160a308cd88e407e676994eb08b10 (diff) | |
| parent | 617550628b39f94e6cb11ec032eb18e6195bf64a (diff) | |
Merge branch 'master' of git://projects.archlinux.org/archweb
Conflicts:
local_settings.py.example
media/archweb.css
packages/templatetags/package_extras.py
public/views.py
templates/packages/details.html
templates/packages/flag.html
templates/packages/flag_confirmed.html
templates/packages/flagged.html
templates/packages/packages_list.html
templates/packages/search.html
templates/packages/signoffs.html
templates/public/about.html
templates/public/download.html
templates/public/index.html
templates/public/svn.html
templates/releng/results.html
templates/todolists/view.html
Diffstat (limited to 'mirrors')
| -rw-r--r-- | mirrors/admin.py | 3 | ||||
| -rw-r--r-- | mirrors/management/commands/mirrorcheck.py | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/mirrors/admin.py b/mirrors/admin.py index b7b478de..0632872d 100644 --- a/mirrors/admin.py +++ b/mirrors/admin.py @@ -59,7 +59,8 @@ class MirrorAdminForm(forms.ModelForm): class MirrorAdmin(admin.ModelAdmin): form = MirrorAdminForm - list_display = ('name', 'tier', 'country', 'active', 'public', 'isos', 'admin_email', 'supported_protocols') + list_display = ('name', 'tier', 'country', 'active', 'public', + 'isos', 'admin_email') list_filter = ('tier', 'active', 'public', 'country') search_fields = ('name',) inlines = [ diff --git a/mirrors/management/commands/mirrorcheck.py b/mirrors/management/commands/mirrorcheck.py index 7bd79c83..8eb8b010 100644 --- a/mirrors/management/commands/mirrorcheck.py +++ b/mirrors/management/commands/mirrorcheck.py @@ -68,7 +68,7 @@ def check_mirror_url(mirror_url): log.last_sync = parsed_time # if we couldn't parse a time, this is a failure - if parsed_time == None: + if parsed_time is None: log.error = "Could not parse time from lastsync" log.is_success = False log.duration = end - start |