diff --git a/repo b/repo index 7ca16b0df..6762c75f3 100755 --- a/repo +++ b/repo @@ -33,7 +33,7 @@ REPO_REV = 'stable' # limitations under the License. # increment this whenever we make important changes to this script -VERSION = (1, 25) +VERSION = (1, 26) # increment this if the MAINTAINER_KEYS block is modified KEYRING_VERSION = (1, 5) @@ -570,7 +570,7 @@ def _CheckGitVersion(): raise CloneFailure() if ver_act is None: - print('error: "%s" unsupported' % ver_str, file=sys.stderr) + print('fatal: unable to detect git version', file=sys.stderr) raise CloneFailure() if ver_act < MIN_GIT_VERSION: @@ -632,7 +632,7 @@ def SetupGnuPG(quiet): print(file=sys.stderr) return False - proc.stdin.write(MAINTAINER_KEYS) + proc.stdin.write(MAINTAINER_KEYS.encode('utf-8')) proc.stdin.close() if proc.wait() != 0: @@ -711,6 +711,7 @@ def _DownloadBundle(url, local, quiet): cwd=local, stdout=subprocess.PIPE) for line in proc.stdout: + line = line.decode('utf-8') m = re.compile(r'^url\.(.*)\.insteadof (.*)$').match(line) if m: new_url = m.group(1) @@ -803,7 +804,7 @@ def _Verify(cwd, branch, quiet): stdout=subprocess.PIPE, stderr=subprocess.PIPE, cwd=cwd) - cur = proc.stdout.read().strip() + cur = proc.stdout.read().strip().decode('utf-8') proc.stdout.close() proc.stderr.read() @@ -835,10 +836,10 @@ def _Verify(cwd, branch, quiet): stderr=subprocess.PIPE, cwd=cwd, env=env) - out = proc.stdout.read() + out = proc.stdout.read().decode('utf-8') proc.stdout.close() - err = proc.stderr.read() + err = proc.stderr.read().decode('utf-8') proc.stderr.close() if proc.wait() != 0: @@ -988,7 +989,7 @@ def _SetDefaultsTo(gitdir): 'HEAD'], stdout=subprocess.PIPE, stderr=subprocess.PIPE) - REPO_REV = proc.stdout.read().strip() + REPO_REV = proc.stdout.read().strip().decode('utf-8') proc.stdout.close() proc.stderr.read()