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

fix version decode, added safe_decode for bench

Browse Source
This commit is contained in:
Achilles Rasquinha 2018-03-19 11:43:07 +05:30
parent 67269c26a4
commit 77ac926361
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
bench/utils.py
View File

@ -16,6 +16,13 @@ logger = logging.getLogger(__name__)
folders_in_bench = ('apps', 'sites', 'config', 'logs', 'config/pids') folders_in_bench = ('apps', 'sites', 'config', 'logs', 'config/pids')
def safe_decode(string, encoding = 'utf-8'):
try:
string = string.decode(encoding)
except Exception:
pass
return string
def get_frappe(bench_path='.'): def get_frappe(bench_path='.'):
frappe = get_env_cmd('frappe', bench_path=bench_path) frappe = get_env_cmd('frappe', bench_path=bench_path)
if not os.path.exists(frappe): if not os.path.exists(frappe):
@ -351,7 +358,7 @@ def get_git_version():
'''returns git version from `git --version` '''returns git version from `git --version`
extracts version number from string `get version 1.9.1` etc''' extracts version number from string `get version 1.9.1` etc'''
version = get_cmd_output("git --version") version = get_cmd_output("git --version")
version = version.decode('utf-8') version = safe_decode(version)
version = version.strip().split()[2] version = version.strip().split()[2]
version = '.'.join(version.split('.')[0:2]) version = '.'.join(version.split('.')[0:2])
return float(version) return float(version)