2
0
mirror of https://github.com/frappe/bench.git synced 2025-01-09 08:30:39 +00:00

Merge branch 'develop' into supervisor-restart-on-patch

This commit is contained in:
gavin 2020-05-11 11:51:16 +05:30 committed by GitHub
commit 4c9c12f1a6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -359,7 +359,10 @@ def run_playbook(playbook_name, sudo=False, extra_vars=None):
else:
cwd = os.path.join(os.path.expanduser('~'), 'bench')
success = subprocess.check_call(args, cwd=os.path.join(cwd, 'bench', 'playbooks'), stdout=log_stream, stderr=sys.stderr)
playbooks_locations = [os.path.join(cwd, 'bench', 'playbooks'), os.path.join(cwd, 'playbooks')]
playbooks_folder = [x for x in playbooks_locations if os.path.exists(x)][0]
success = subprocess.check_call(args, cwd=playbooks_folder, stdout=log_stream, stderr=sys.stderr)
return success