InTheForest/chromium_depot_tools
1
0
Fork 0
mirror of https://chromium.googlesource.com/chromium/tools/depot_tools.git synced 2026-01-11 18:51:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

repo: pull in updates from latest release

Browse Source 
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>
This commit is contained in:
Mike Frysinger
2019-09-18 18:45:37 +00:00
committed by Commit Bot
parent 24995256ee
commit 8baaec47e3
1 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
repo
View File

@@ -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()