mirror of
https://github.com/janeczku/calibre-web
synced 2025-08-06 22:14:30 +00:00
Merge branch 'master' into Develop
# Conflicts: # cps/server.py
This commit is contained in:
commit
3cb9a9b04a
@ -152,7 +152,7 @@ class WebServer(object):
|
|||||||
# The value of __package__ indicates how Python was called. It may
|
# The value of __package__ indicates how Python was called. It may
|
||||||
# not exist if a setuptools script is installed as an egg. It may be
|
# not exist if a setuptools script is installed as an egg. It may be
|
||||||
# set incorrectly for entry points created with pip on Windows.
|
# set incorrectly for entry points created with pip on Windows.
|
||||||
if getattr(__main__, "__package__", "") == "" or (
|
if getattr(__main__, "__package__", "") in ["", None] or (
|
||||||
os.name == "nt"
|
os.name == "nt"
|
||||||
and __main__.__package__ == ""
|
and __main__.__package__ == ""
|
||||||
and not os.path.exists(py_script)
|
and not os.path.exists(py_script)
|
||||||
@ -265,7 +265,7 @@ class WebServer(object):
|
|||||||
if os.environ.get('FLASK_DEBUG'):
|
if os.environ.get('FLASK_DEBUG'):
|
||||||
subprocess.run(args, close_fds=True) # nosec
|
subprocess.run(args, close_fds=True) # nosec
|
||||||
else:
|
else:
|
||||||
subprocess.Popen(args, close_fds=True) # nosec
|
subprocess.Popen(args, close_fds=True) # nosec
|
||||||
return True
|
return True
|
||||||
|
|
||||||
@staticmethod
|
@staticmethod
|
||||||
|
Loading…
x
Reference in New Issue
Block a user