diff options
| author | Nirbheek Chauhan <nirbheek@centricular.com> | 2020-02-20 21:24:23 +0530 |
|---|---|---|
| committer | Xavier Claessens <xclaesse@gmail.com> | 2020-02-20 12:20:29 -0500 |
| commit | 4597235f924fa931a3376814ae76db7e150ded58 (patch) | |
| tree | 2c2a94942f2058198fb433ab2ad12df9582c0627 /mesonbuild/msubprojects.py | |
| parent | 73f03e6093114e5ae42bd52a358d6e65af72aba6 (diff) | |
| download | meson-4597235f924fa931a3376814ae76db7e150ded58.zip meson-4597235f924fa931a3376814ae76db7e150ded58.tar.gz meson-4597235f924fa931a3376814ae76db7e150ded58.tar.bz2 | |
msubprojects: We return a string from git() now
Fixes https://github.com/mesonbuild/meson/issues/6651
Diffstat (limited to 'mesonbuild/msubprojects.py')
| -rwxr-xr-x | mesonbuild/msubprojects.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/mesonbuild/msubprojects.py b/mesonbuild/msubprojects.py index d6f0715..b1c79b8 100755 --- a/mesonbuild/msubprojects.py +++ b/mesonbuild/msubprojects.py @@ -60,7 +60,7 @@ def update_git(wrap, repo_dir, options): git_output(['fetch'], repo_dir) git_output(['checkout', revision], repo_dir) except subprocess.CalledProcessError as e: - out = e.output.decode().strip() + out = e.output.strip() mlog.log(' -> Could not checkout revision', mlog.cyan(revision)) mlog.log(mlog.red(out)) mlog.log(mlog.red(str(e))) @@ -70,7 +70,7 @@ def update_git(wrap, repo_dir, options): # We are in the same branch, pull latest commits git_output(['-c', 'rebase.autoStash=true', 'pull', '--rebase'], repo_dir) except subprocess.CalledProcessError as e: - out = e.output.decode().strip() + out = e.output.strip() mlog.log(' -> Could not rebase', mlog.bold(repo_dir), 'please fix and try again.') mlog.log(mlog.red(out)) mlog.log(mlog.red(str(e))) @@ -83,7 +83,7 @@ def update_git(wrap, repo_dir, options): git_output(['fetch'], repo_dir) git_output(['-c', 'rebase.autoStash=true', 'rebase', revision], repo_dir) except subprocess.CalledProcessError as e: - out = e.output.decode().strip() + out = e.output.strip() mlog.log(' -> Could not rebase', mlog.bold(repo_dir), 'please fix and try again.') mlog.log(mlog.red(out)) mlog.log(mlog.red(str(e))) @@ -153,7 +153,7 @@ def checkout(wrap, repo_dir, options): git_output(cmd, repo_dir) git_show(repo_dir) except subprocess.CalledProcessError as e: - out = e.output.decode().strip() + out = e.output.strip() mlog.log(' -> ', mlog.red(out)) def download(wrap, repo_dir, options): |