This commit is contained in:
Kovid Goyal 2015-12-31 17:01:11 +05:30
parent f624334abf
commit d90d89aa8c

View File

@ -558,14 +558,18 @@ class Win32Freeze(Command, WixMixIn):
args = ['signtool.exe', 'sign', '/a', '/fd', 'sha256', '/td', 'sha256', '/d', args = ['signtool.exe', 'sign', '/a', '/fd', 'sha256', '/td', 'sha256', '/d',
'calibre - E-book management', '/du', 'calibre - E-book management', '/du',
'http://calibre-ebook.com', '/tr'] 'http://calibre-ebook.com', '/tr']
for timeserver in ('http://timestamp.geotrust.com/tsa', 'http://timestamp.comodoca.com/rfc3161',):
try: def runcmd(cmd):
subprocess.check_call(args + [timeserver] + files) for timeserver in ('http://timestamp.geotrust.com/tsa', 'http://timestamp.comodoca.com/rfc3161',):
break try:
except subprocess.CalledProcessError: subprocess.check_call(cmd + [timeserver] + files)
print ('Signing failed, retrying with different timestamp server') break
else: except subprocess.CalledProcessError:
raise SystemExit('Signing failed') print ('Signing failed, retrying with different timestamp server')
else:
raise SystemExit('Signing failed')
runcmd(args)
def add_dir_to_zip(self, zf, path, prefix=''): def add_dir_to_zip(self, zf, path, prefix=''):
''' '''