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

Merge pull request #1160 from gavindsouza/yarn-not-found

Browse Source 
Revert "fix: Use execve and set envvars instead of execv"
This commit is contained in:
gavin 2021-04-26 11:54:18 +05:30 committed by GitHub
commit c183c90090
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
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='.'): def old_frappe_cli(bench_path='.'):
f = get_frappe(bench_path=bench_path) f = get_frappe(bench_path=bench_path)
os.chdir(os.path.join(bench_path, 'sites')) 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='.'): def app_cmd(bench_path='.'):
f = get_env_cmd('python', bench_path=bench_path) f = get_env_cmd('python', bench_path=bench_path)
os.chdir(os.path.join(bench_path, 'sites')) 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='.'): def frappe_cmd(bench_path='.'):
f = get_env_cmd('python', bench_path=bench_path) f = get_env_cmd('python', bench_path=bench_path)
os.chdir(os.path.join(bench_path, 'sites')) 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(): 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): def start(no_dev=False, concurrency=None, procfile=None, no_prefix=False):
env = os.environ
program = get_process_manager() program = get_process_manager()
if not program: if not program:
raise Exception("No process manager found") raise Exception("No process manager found")
os.environ['PYTHONUNBUFFERED'] = "true"
env['PYTHONUNBUFFERED'] = "true"
if not no_dev: if not no_dev:
env['DEV_SERVER'] = "true" os.environ['DEV_SERVER'] = "true"
command = [program, 'start'] command = [program, 'start']
if concurrency: if concurrency:
@ -473,7 +470,7 @@ def start(no_dev=False, concurrency=None, procfile=None, no_prefix=False):
if no_prefix: if no_prefix:
command.extend(['--no-prefix']) command.extend(['--no-prefix'])
os.execve(program, command, env=env) os.execv(program, command)
def get_git_version(): def get_git_version():