X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=daklib%2Futils.py;h=b20a063a452d4e9d1354f8e4a19c519205855295;hb=b34e1454c174ccc89f552a0871fbf18e19a01264;hp=373910c4783393361ca046710cfe06d8f714ca65;hpb=6f4cbaedd49063dcb8b1eab75ede9d0a0ac3b71f;p=dak.git diff --git a/daklib/utils.py b/daklib/utils.py index 373910c4..b20a063a 100755 --- a/daklib/utils.py +++ b/daklib/utils.py @@ -38,6 +38,7 @@ import apt_pkg import database import time import re +import string import email as modemail from dak_exceptions import * from regexes import re_html_escaping, html_escaping, re_single_line_field, \ @@ -1344,7 +1345,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))