repo: Update from upstream

- 243df2042ed756e7829cd39d3ebe3d1919444d5d launcher: change RunResult to subprocess.CompletedProcess by Mike Frysinger <vapier@google.com>

GitOrigin-RevId: 243df2042ed756e7829cd39d3ebe3d1919444d5d
Change-Id: I2c607922216ee35f8555c023b25e6e9e37a6d9c6
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/6405593
Auto-Submit: Mike Frysinger <vapier@chromium.org>
Commit-Queue: Gavin Mak <gavinmak@google.com>
Reviewed-by: Gavin Mak <gavinmak@google.com>
changes/93/6405593/2
Android Open Source Project 8 months ago committed by LUCI CQ
parent 2e17cd1d70
commit 7e4f6d1841

@ -124,7 +124,7 @@ if not REPO_REV:
BUG_URL = "https://issues.gerritcodereview.com/issues/new?component=1370071"
# increment this whenever we make important changes to this script
VERSION = (2, 50)
VERSION = (2, 54)
# increment this if the MAINTAINER_KEYS block is modified
KEYRING_VERSION = (2, 3)
@ -483,11 +483,6 @@ def InitParser(parser):
# This is a poor replacement for subprocess.run until we require Python 3.6+.
RunResult = collections.namedtuple(
"RunResult", ("returncode", "stdout", "stderr")
)
class RunError(Exception):
"""Error when running a command failed."""
@ -526,7 +521,9 @@ def run_command(cmd, **kwargs):
elif stderr == subprocess.STDOUT:
dbg += " 2>&1"
trace.print(dbg)
ret = RunResult(proc.returncode, decode(stdout), decode(stderr))
ret = subprocess.CompletedProcess(
cmd, proc.returncode, decode(stdout), decode(stderr)
)
# If things failed, print useful debugging output.
if check and ret.returncode:
@ -553,7 +550,6 @@ def run_command(cmd, **kwargs):
class CloneFailure(Exception):
"""Indicate the remote clone of repo itself failed."""

Loading…
Cancel
Save