Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-07-09 03:04:10 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix #1687540 [calibre does not build reproducibly](https://bugs.launchpad.net/calibre/+bug/1687540)

Browse Source
This commit is contained in:
Kovid Goyal 2017-05-28 13:42:09 +05:30
parent a0a1261bc4
commit 3e195a8ddf
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/calibre/linux.py
View File

@ -932,15 +932,17 @@ complete -F _'''%(opts, words) + fname + ' ' + name +"\n\n").encode('utf-8')
pics = {'jpg', 'jpeg', 'gif', 'png', 'bmp'} pics = {'jpg', 'jpeg', 'gif', 'png', 'bmp'}
pics = list(sorted(pics)) # for reproducability
def opts_and_exts(name, op, exts, cover_opts=('--cover',), opf_opts=(), def opts_and_exts(name, op, exts, cover_opts=('--cover',), opf_opts=(),
file_map={}): file_map={}):
opts = ' '.join(options(op)) opts = ' '.join(options(op))
exts.extend([i.upper() for i in exts]) exts.extend([i.upper() for i in exts])
exts='|'.join(exts) exts='|'.join(sorted(exts))
fname = name.replace('-', '_') fname = name.replace('-', '_')
spics = '|'.join(tuple(pics) + tuple(x.upper() for x in pics)) spics = pics + [i.upper() for i in pics]
spics = '|'.join(sorted(spics))
special_exts_template = '''\ special_exts_template = '''\
%s ) %s )
_filedir %s _filedir %s
@ -950,7 +952,7 @@ def opts_and_exts(name, op, exts, cover_opts=('--cover',), opf_opts=(),
extras = [] extras = []
for eopts, eexts in ((cover_opts, "${pics}"), (opf_opts, "'@(opf)'")): for eopts, eexts in ((cover_opts, "${pics}"), (opf_opts, "'@(opf)'")):
for opt in eopts: for opt in eopts:
extras.append(special_exts_template%(opt, sorted(eexts))) extras.append(special_exts_template%(opt, eexts))
extras = '\n'.join(extras) extras = '\n'.join(extras)
return '_'+fname+'()'+\ return '_'+fname+'()'+\
@ -981,7 +983,7 @@ def opts_and_exts(name, op, exts, cover_opts=('--cover',), opf_opts=(),
} }
complete -o filenames -F _'''%dict(pics=spics, complete -o filenames -F _'''%dict(pics=spics,
opts=opts, extras=extras, exts=sorted(exts)) + fname + ' ' + name +"\n\n" opts=opts, extras=extras, exts=exts) + fname + ' ' + name +"\n\n"
VIEWER = '''\ VIEWER = '''\