storage status: report expiration-cutoff-date like 19-Mar-2009 (as opposed to the...

diff --git a/src/allmydata/test/test_storage.py b/src/allmydata/test/test_storage.py
index 23898df3286f1edb6deb2fe57f46ade676c6bf49..fa9d06640e84109da85532f779adae1d5b930742 100644 (file)
--- a/src/allmydata/test/test_storage.py
+++ b/src/allmydata/test/test_storage.py
@@ -2020,7 +2020,7 @@ class LeaseCrawler(unittest.TestCase, pollmixin.PollMixin, WebRenderingMixin):
             s = remove_tags(html)
             self.failUnlessIn("Expiration Enabled:"
                               " expired leases will be removed", s)
-            date = time.strftime("%Y-%m-%d", time.gmtime(then))
+            date = time.strftime("%d-%b-%Y", time.gmtime(then))
             self.failUnlessIn("Leases created or last renewed before %s"
                               " will be considered expired." % date, s)
             self.failUnlessIn(" recovered: 2 shares, 2 buckets (1 mutable / 1 immutable), ", s)

diff --git a/src/allmydata/web/storage.py b/src/allmydata/web/storage.py
index b35839ea6ccfb5292ab6a69c5e70f3f7f9880bbe..079f68a905244e63ae53c500f06d57437a4cf33f 100644 (file)
--- a/src/allmydata/web/storage.py
+++ b/src/allmydata/web/storage.py
@@ -139,7 +139,7 @@ class StorageStatus(rend.Page):
                         % abbreviate_time(lc.override_lease_duration)]
         else:
             assert lc.mode == "cutoff-date"
-            date = time.strftime("%Y-%m-%d", time.gmtime(lc.cutoff_date))
+            date = time.strftime("%d-%b-%Y", time.gmtime(lc.cutoff_date))
             ctx.tag["Leases created or last renewed before %s "
                     "will be considered expired." % date]
         if len(lc.mode) > 2: