From 2c80d01be6a9201333d80f5617a9d7fb60a58861 Mon Sep 17 00:00:00 2001
From: Nico Weber <thakis@chromium.org>
Date: Thu, 19 Sep 2019 18:45:38 +0000
Subject: [PATCH] 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 <vapier@chromium.org>
> Reviewed-by: Alex Klein <saklein@chromium.org>

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 <thakis@chromium.org>
Commit-Queue: Nico Weber <thakis@chromium.org>
---
 repo | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/repo b/repo
index 6762c75f3..7ca16b0df 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, 26)
+VERSION = (1, 25)
 
 # 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('fatal: unable to detect git version', file=sys.stderr)
+    print('error: "%s" unsupported' % ver_str, 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.encode('utf-8'))
+  proc.stdin.write(MAINTAINER_KEYS)
   proc.stdin.close()
 
   if proc.wait() != 0:
@@ -711,7 +711,6 @@ 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)
@@ -804,7 +803,7 @@ def _Verify(cwd, branch, quiet):
                           stdout=subprocess.PIPE,
                           stderr=subprocess.PIPE,
                           cwd=cwd)
-  cur = proc.stdout.read().strip().decode('utf-8')
+  cur = proc.stdout.read().strip()
   proc.stdout.close()
 
   proc.stderr.read()
@@ -836,10 +835,10 @@ def _Verify(cwd, branch, quiet):
                           stderr=subprocess.PIPE,
                           cwd=cwd,
                           env=env)
-  out = proc.stdout.read().decode('utf-8')
+  out = proc.stdout.read()
   proc.stdout.close()
 
-  err = proc.stderr.read().decode('utf-8')
+  err = proc.stderr.read()
   proc.stderr.close()
 
   if proc.wait() != 0:
@@ -989,7 +988,7 @@ def _SetDefaultsTo(gitdir):
                            'HEAD'],
                           stdout=subprocess.PIPE,
                           stderr=subprocess.PIPE)
-  REPO_REV = proc.stdout.read().strip().decode('utf-8')
+  REPO_REV = proc.stdout.read().strip()
   proc.stdout.close()
 
   proc.stderr.read()