accounting/bench
2
0
Fork 0
mirror of https://github.com/frappe/bench.git synced 2024-11-16 01:57:08 +00:00
Code Issues Releases Activity

Revert "fix: Use execve and set envvars instead of execv"

Browse Source 
This reverts commit 530a980ef7.
This commit is contained in:
Gavin D'souza 2021-04-26 11:32:20 +05:30
parent 085baf5043
commit 64fbeee1e6
2 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
bench/cli.py
View File

@ -109,19 +109,19 @@ def change_uid():
def old_frappe_cli(bench_path='.'):
f = get_frappe(bench_path=bench_path)
os.chdir(os.path.join(bench_path, 'sites'))
os.execve(f, [f] + sys.argv[2:], {})
os.execv(f, [f] + sys.argv[2:])
def app_cmd(bench_path='.'):
f = get_env_cmd('python', bench_path=bench_path)
os.chdir(os.path.join(bench_path, 'sites'))
os.execve(f, [f] + ['-m', 'frappe.utils.bench_helper'] + sys.argv[1:], {})
os.execv(f, [f] + ['-m', 'frappe.utils.bench_helper'] + sys.argv[1:])
def frappe_cmd(bench_path='.'):
f = get_env_cmd('python', bench_path=bench_path)
os.chdir(os.path.join(bench_path, 'sites'))
os.execve(f, [f] + ['-m', 'frappe.utils.bench_helper', 'frappe'] + sys.argv[1:], {})
os.execv(f, [f] + ['-m', 'frappe.utils.bench_helper', 'frappe'] + sys.argv[1:])
def get_frappe_commands():

9
bench/utils.py
View File

@ -453,15 +453,12 @@ def get_process_manager():
def start(no_dev=False, concurrency=None, procfile=None, no_prefix=False):
env = os.environ
program = get_process_manager()
if not program:
raise Exception("No process manager found")
env['PYTHONUNBUFFERED'] = "true"
os.environ['PYTHONUNBUFFERED'] = "true"
if not no_dev:
env['DEV_SERVER'] = "true"
os.environ['DEV_SERVER'] = "true"
command = [program, 'start']
if concurrency:
@ -473,7 +470,7 @@ def start(no_dev=False, concurrency=None, procfile=None, no_prefix=False):
if no_prefix:
command.extend(['--no-prefix'])
os.execve(program, command, env=env)
os.execv(program, command)
def get_git_version():