2
0
mirror of https://github.com/frappe/bench.git synced 2024-11-11 15:51:03 +00:00

Merge pull request #571 from frappe/py3-fix

bytes to str
This commit is contained in:
Achilles Rasquinha 2018-02-15 12:45:56 +05:30 committed by GitHub
commit 9c834bc561
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -269,7 +269,7 @@ def get_upstream_version(app, branch=None, bench_path='.'):
try:
contents = subprocess.check_output(['git', 'show', 'upstream/{branch}:{app}/__init__.py'.format(branch=branch, app=app)], cwd=repo_dir, stderr=subprocess.STDOUT)
except subprocess.CalledProcessError as e:
if "Invalid object" in e.output:
if b"Invalid object" in e.output:
return None
else:
raise