mirror of
https://github.com/frappe/bench.git
synced 2025-01-10 00:37:51 +00:00
fix(install): Allow override of frappe_branch and erpnext_branch
Regardless of args.version (which always has a default set). Additionally, print useful log of (non-credentials) variables used.
This commit is contained in:
parent
0367010335
commit
6a207ca57a
@ -247,10 +247,9 @@ def install_bench(args):
|
|||||||
else:
|
else:
|
||||||
frappe_branch = "version-{0}".format(args.version)
|
frappe_branch = "version-{0}".format(args.version)
|
||||||
erpnext_branch = "version-{0}".format(args.version)
|
erpnext_branch = "version-{0}".format(args.version)
|
||||||
else:
|
# Allow override of frappe_branch and erpnext_branch, regardless of args.version (which always has a default set)
|
||||||
if args.frappe_branch:
|
if args.frappe_branch:
|
||||||
frappe_branch = args.frappe_branch
|
frappe_branch = args.frappe_branch
|
||||||
|
|
||||||
if args.erpnext_branch:
|
if args.erpnext_branch:
|
||||||
erpnext_branch = args.erpnext_branch
|
erpnext_branch = args.erpnext_branch
|
||||||
|
|
||||||
@ -261,6 +260,7 @@ def install_bench(args):
|
|||||||
extra_vars.update(bench_name=bench_name)
|
extra_vars.update(bench_name=bench_name)
|
||||||
|
|
||||||
# Will install ERPNext production setup by default
|
# Will install ERPNext production setup by default
|
||||||
|
log("Initializing bench using bench_name=%s frappe_branch=%s erpnext_branch=%s ..." % (bench_name, frappe_branch, erpnext_branch))
|
||||||
run_playbook('site.yml', sudo=True, extra_vars=extra_vars)
|
run_playbook('site.yml', sudo=True, extra_vars=extra_vars)
|
||||||
|
|
||||||
if os.path.exists(tmp_bench_repo):
|
if os.path.exists(tmp_bench_repo):
|
||||||
|
Loading…
Reference in New Issue
Block a user