summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJiri Tyr <jiri.tyr@gmail.com>2020-02-06 16:32:46 +0000
committerMike Frysinger <vapier@google.com>2020-02-10 23:31:45 -0500
commit68744dbc01490dc283db7c965c5cfe07135814ac (patch)
tree8c00939c3dd608ee642b30ea35682f6c73ff9079
parentef412624e953db6afdf402b18b004c0beabc5917 (diff)
downloadgit-repo-68744dbc01490dc283db7c965c5cfe07135814ac.tar.gz
Fixing forall subcommand for Py3v1.13.10
Execution of 'repo forall -p -c' doesn't work with Py3 and ends up with an error: Got an error, terminating the pool: TypeError: can only concatenate str (not "bytes") to str That's fixed by using the decode() method. Change-Id: Ice01aaa1822dde8d957b5bf096021dd5a2b7dd51 Reviewed-on: https://gerrit-review.googlesource.com/c/git-repo/+/253659 Reviewed-by: Mike Frysinger <vapier@google.com> Reviewed-by: David Pursehouse <dpursehouse@collab.net> Tested-by: Jiri Tyr <jiri.tyr@gmail.com> (cherry picked from commit 83a3227b62c936b346b825b333fc2ca65528ecfd)
-rw-r--r--subcmds/forall.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/subcmds/forall.py b/subcmds/forall.py
index 96eac541..131ba676 100644
--- a/subcmds/forall.py
+++ b/subcmds/forall.py
@@ -366,7 +366,7 @@ def DoWork(project, mirror, opt, cmd, shell, cnt, config):
366 while not s_in.is_done: 366 while not s_in.is_done:
367 in_ready = s_in.select() 367 in_ready = s_in.select()
368 for s in in_ready: 368 for s in in_ready:
369 buf = s.read() 369 buf = s.read().decode()
370 if not buf: 370 if not buf:
371 s.close() 371 s.close()
372 s_in.remove(s) 372 s_in.remove(s)