Merge branch 'archweb-generic' into master-nomake

Conflicts:
	README.md

1 files changed, 10 insertions, 0 deletions

diff --git a/mirrors/models.py b/mirrors/models.py
index da3d8c0d..57664562 100644
--- a/mirrors/models.py
+++ b/mirrors/models.py
@@ -1,3 +1,4 @@
+from datetime import timedelta
 import socket
 from urlparse import urlparse
 
@@ -28,6 +29,7 @@ class Mirror(models.Model):
     isos = models.BooleanField("ISOs", default=True)
     rsync_user = models.CharField(max_length=50, blank=True, default='')
     rsync_password = models.CharField(max_length=50, blank=True, default='')
+    bug = models.PositiveIntegerField("Flyspray bug", null=True, blank=True)
     notes = models.TextField(blank=True)
     created = models.DateTimeField(editable=False)
 
@@ -158,6 +160,14 @@ class MirrorLog(models.Model):
     is_success = models.BooleanField(default=True)
     error = models.TextField(blank=True, default='')
 
+    def delay(self):
+        if self.last_sync is None:
+            return None
+        # sanity check, this shouldn't happen
+        if self.check_time < self.last_sync:
+            return timedelta()
+        return self.check_time - self.last_sync
+
     def __unicode__(self):
         return "Check of %s at %s" % (self.url.url, self.check_time)