Merge branch 'FreeBSD-build-fix' of https://github.com/madpilot78/calibre

This commit is contained in:
Kovid Goyal 2016-07-23 07:52:50 +05:30
commit 5323f39aa5

View File

@ -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