accounting/bench
2
0
Fork 0
mirror of https://github.com/frappe/bench.git synced 2025-01-24 23:48:24 +00:00
Code Issues Releases Activity

fix: validate branch error message + cleanup

Browse Source
This commit is contained in:
Gavin D'souza 2020-01-17 19:42:05 +05:30
parent 5762724cc7
commit b85651653b
1 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
bench/app.py
View File

@ -423,14 +423,22 @@ def get_apps_json(path):
return json.load(f) return json.load(f)
def validate_branch(): def validate_branch():
installed_apps = get_apps() installed_apps = set(get_apps())
check_apps = ['frappe', 'erpnext'] #this is a dirty work-around. bench update should not assume that erpnext is installed check_apps = set(['frappe', 'erpnext'])
intersection_apps = list(set(installed_apps) & set(check_apps)) intersection_apps = installed_apps and check_apps
for app in intersection_apps: for app in intersection_apps:
branch = get_current_branch(app) branch = get_current_branch(app)
if branch == "master": if branch == "master":
print(''' master branch is renamed to version-11 and develop to version-12. Please switch to new branches to get future updates. print("""'master' branch is renamed to 'version-11' since 'version-12' release.
As of January 2020, the following branches are
version Frappe ERPNext
11 version-11 version-11
12 version-12 version-12
13 develop develop
Please switch to new branches to get future updates.
To switch to your required branch, run the following commands: bench switch-to-branch [branch-name]""")
To switch to version 11, run the following commands: bench switch-to-branch version-11''')
sys.exit(1) sys.exit(1)