diff options
| author | Matias Elo <matias.elo@nokia.com> | 2020-06-05 14:24:13 +0300 |
|---|---|---|
| committer | Matias Elo <matias.elo@nokia.com> | 2020-06-08 16:13:50 +0300 |
| commit | 6939b21f2b56ceee7f86aa84942000cea5eeba95 (patch) | |
| tree | 9b4d5c0095bc5d280bd6a4d1cda069b4961eec5d | |
| parent | 0b7fb60a26c39a8b1e34cb02cfd6785a188dec3f (diff) | |
scripts: git-transplant.py: encode subprocess output a string
Change subprocess output from bytes to a string. Enables running the script
with new Python versions.
Signed-off-by: Matias Elo <matias.elo@nokia.com>
Reviewed-by: Petri Savolainen <petri.savolainen@nokia.com>
| -rwxr-xr-x | scripts/git-transplant.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/scripts/git-transplant.py b/scripts/git-transplant.py index 4de62c3c5..69bcf72b5 100755 --- a/scripts/git-transplant.py +++ b/scripts/git-transplant.py @@ -78,7 +78,8 @@ for dirname, dirnames, filenames in os.walk(overlay_dir): wholefilechanges = "git log --oneline --ancestry-path --name-status " + \ interval + " " + orig_dir + " |grep \"^A\"" try: - output = subprocess.check_output([wholefilechanges], shell=True) + output = subprocess.check_output([wholefilechanges], shell=True, + encoding='utf8') except subprocess.CalledProcessError: output = "" pass |