diff options
| author | Luke Shumaker <LukeShu@sbcglobal.net> | 2012-11-14 22:44:27 -0500 |
|---|---|---|
| committer | Luke Shumaker <LukeShu@sbcglobal.net> | 2012-11-14 22:44:27 -0500 |
| commit | 64f6dd9cb41ddbc84376549f558ed7d52d9e600a (patch) | |
| tree | 81f31f1ceb5fc6e4d94508d273003996e036191c /mirrors/templatetags/mirror_status.py | |
| parent | bc432a1ff0e69bf45c5f3b97077a13952611196d (diff) | |
| parent | b2b5c1a064d5d3c33f4c4fc119bd67cf9ca1b7ba (diff) | |
Merge tag 'release_2012-01-11'
Pkgbase view in todos, other changes related to caching
Conflicts:
public/views.py
Diffstat (limited to 'mirrors/templatetags/mirror_status.py')
| -rw-r--r-- | mirrors/templatetags/mirror_status.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mirrors/templatetags/mirror_status.py b/mirrors/templatetags/mirror_status.py index 0031d83b..9a363fbe 100644 --- a/mirrors/templatetags/mirror_status.py +++ b/mirrors/templatetags/mirror_status.py @@ -10,7 +10,7 @@ def duration(value): return u'' # does not take microseconds into account total_secs = value.seconds + value.days * 24 * 3600 - mins, secs = divmod(total_secs, 60) + mins = total_secs // 60 hrs, mins = divmod(mins, 60) return '%d:%02d' % (hrs, mins) @@ -20,7 +20,7 @@ def hours(value): return u'' # does not take microseconds into account total_secs = value.seconds + value.days * 24 * 3600 - mins, secs = divmod(total_secs, 60) + mins = total_secs // 60 hrs, mins = divmod(mins, 60) if hrs == 1: return '%d hour' % hrs |