Merge branch 'master' into content_generation, make changes based on Joerg's review

[dak.git] / daklib / utils.py

diff --git a/daklib/utils.py b/daklib/utils.py
index 1b35feef2eb697e930152b85ca612b3f1ea9e29e..9bbf711ac5f92e71cfd06ddda7ae406698dbb608 100755 (executable)
--- a/daklib/utils.py
+++ b/daklib/utils.py
@@ -1346,7 +1346,10 @@ def check_signature (sig_filename, reject, data_filename="", keyrings=None, auto
         if len(args) >= 1:
             timestamp = args[0]
             if timestamp.count("T") == 0:
-                expiredate = time.strftime("%Y-%m-%d", time.gmtime(timestamp))
+                try:
+                    expiredate = time.strftime("%Y-%m-%d", time.gmtime(float(timestamp)))
+                except ValueError:
+                    expiredate = "unknown (%s)" % (timestamp)
             else:
                 expiredate = timestamp
         reject("The key used to sign %s has expired on %s" % (sig_filename, expiredate))