From 64ae6993f71edd1b0804b1fe481762f5cc1e4476 Mon Sep 17 00:00:00 2001 From: Nico Weber Date: Thu, 19 Sep 2019 19:03:28 +0000 Subject: [PATCH] Reland "repo: pull in updates from latest release" This reverts commit 2c80d01be6a9201333d80f5617a9d7fb60a58861. Reason for revert: Didn't help. Original change's description: > Revert "repo: pull in updates from latest release" > > This reverts commit 8baaec47e3bd78315b22ba62024c12641b11fa6c. > > Reason for revert: Speculative, to see if this unbreaks > https://ci.chromium.org/p/infra/builders/try/ChromiumOS%20downstream%20Recipe%20Roll%20tester%20from%20Depot%20Tools > > Original change's description: > > repo: pull in updates from latest release > > > > These are mostly about rolling in Python 3 encoding fixes. > > > > Bug: None > > Test: `repo sync` works w/Python 3 > > Change-Id: I7d749a3a62523a7c802fb0ed7dcd383868df1d6f > > Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/1809420 > > Commit-Queue: Mike Frysinger > > Reviewed-by: Alex Klein > > TBR=vapier@chromium.org,saklein@chromium.org > > Change-Id: I7b446fe0460390dcefe6248f1ef7a004335bb796 > No-Presubmit: true > No-Tree-Checks: true > No-Try: true > Bug: None > Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/1814467 > Reviewed-by: Nico Weber > Commit-Queue: Nico Weber TBR=vapier@chromium.org,thakis@chromium.org,saklein@chromium.org Change-Id: I5e1ff54478d8597c33901f8d7a2d7bcc6c203d20 No-Presubmit: true No-Tree-Checks: true No-Try: true Bug: None Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/1814469 Reviewed-by: Nico Weber Commit-Queue: Nico Weber --- repo | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) 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()