From 048e35a80f597790890ccfd97fce07bebfc1d01f Mon Sep 17 00:00:00 2001
From: Joshua Tauberer <jt@occams.info>
Date: Sun, 12 Oct 2014 21:31:44 +0000
Subject: [PATCH] fix display of backups that are past due to be reaped

---
 management/backup.py | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/management/backup.py b/management/backup.py
index 2d0ae3fd..d6ffd9f7 100755
--- a/management/backup.py
+++ b/management/backup.py
@@ -25,7 +25,8 @@ def backup_status(env):
 	# see how large the storage is.
 
 	now = datetime.datetime.now(dateutil.tz.tzlocal())
-	def reldate(date, ref):
+	def reldate(date, ref, clip):
+		if ref < date: return clip
 		rd = dateutil.relativedelta.relativedelta(ref, date)
 		if rd.months > 1: return "%d months, %d days" % (rd.months, rd.days)
 		if rd.months == 1: return "%d month, %d days" % (rd.months, rd.days)
@@ -47,7 +48,7 @@ def backup_status(env):
 			backups[key] = {
 				"date": m.group("date"),
 				"date_str": date.strftime("%x %X"),
-				"date_delta": reldate(date, now),
+				"date_delta": reldate(date, now, "the future?"),
 				"full": m.group("incbase") is None,
 				"previous": m.group("incbase"),
 				"size": 0,
@@ -80,7 +81,7 @@ def backup_status(env):
 			deleted_in = None
 		elif saw_full and not deleted_in:
 			# Mark deleted_in only on the first increment after a full backup.
-			deleted_in = reldate(days_ago, dateutil.parser.parse(bak["date"]))
+			deleted_in = reldate(days_ago, dateutil.parser.parse(bak["date"]), "on next daily backup")
 			bak["deleted_in"] = deleted_in
 
 	return {