accounting/bench
2
0
Fork 0
mirror of https://github.com/frappe/bench.git synced 2024-11-14 09:14:04 +00:00
Code Issues Releases Activity

Merge pull request #821 from saurabh6790/branching_fixes

Browse Source 
fix: branch argument while running easy install
This commit is contained in:
Saurabh 2019-07-23 12:31:14 +05:30 committed by GitHub
commit 0859e55636
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
playbooks/install.py
View File

@ -108,6 +108,9 @@ def install_bench(args):
if args.production: if args.production:
extra_vars.update(max_worker_connections=multiprocessing.cpu_count() * 1024) extra_vars.update(max_worker_connections=multiprocessing.cpu_count() * 1024)
frappe_branch = 'version-12'
erpnext_branch = 'version-12'
if args.version: if args.version:
if args.version <= 10: if args.version <= 10:
frappe_branch = "{0}.x.x".format(args.version) frappe_branch = "{0}.x.x".format(args.version)
@ -118,15 +121,12 @@ def install_bench(args):
else: else:
if args.frappe_branch: if args.frappe_branch:
frappe_branch = args.frappe_branch frappe_branch = args.frappe_branch
else:
frappe_branch = 'version-12'
extra_vars.update(frappe_branch=frappe_branch)
if args.erpnext_branch: if args.erpnext_branch:
erpnext_branch = args.erpnext_branch erpnext_branch = args.erpnext_branch
else:
erpnext_branch = 'version-12' extra_vars.update(frappe_branch=frappe_branch)
extra_vars.update(erpnext_branch=erpnext_branch) extra_vars.update(erpnext_branch=erpnext_branch)
bench_name = 'frappe-bench' if not args.bench_name else args.bench_name bench_name = 'frappe-bench' if not args.bench_name else args.bench_name
extra_vars.update(bench_name=bench_name) extra_vars.update(bench_name=bench_name)