mirror of
https://github.com/kovidgoyal/calibre.git
synced 2025-07-07 18:24:30 -04:00
Merge branch 'FreeBSD-build-fix' of https://github.com/madpilot78/calibre
This commit is contained in:
commit
5323f39aa5
@ -79,7 +79,7 @@ def is_ext_allowed(ext):
|
|||||||
only = ext.get('only', '')
|
only = ext.get('only', '')
|
||||||
if only:
|
if only:
|
||||||
only = only.split()
|
only = only.split()
|
||||||
q = 'windows' if iswindows else 'osx' if isosx else 'linux'
|
q = 'windows' if iswindows else 'osx' if isosx else 'bsd' if isbsd else 'linux'
|
||||||
return q in only
|
return q in only
|
||||||
return True
|
return True
|
||||||
|
|
||||||
@ -94,6 +94,8 @@ def parse_extension(ext):
|
|||||||
ans = ext.pop('windows_' + k, ans)
|
ans = ext.pop('windows_' + k, ans)
|
||||||
elif isosx:
|
elif isosx:
|
||||||
ans = ext.pop('osx_' + k, ans)
|
ans = ext.pop('osx_' + k, ans)
|
||||||
|
elif isbsd:
|
||||||
|
ans = ext.pop('bsd_' + k, ans)
|
||||||
else:
|
else:
|
||||||
ans = ext.pop('linux_' + k, ans)
|
ans = ext.pop('linux_' + k, ans)
|
||||||
return ans
|
return ans
|
||||||
|
Loading…
x
Reference in New Issue
Block a user