diff options
Diffstat (limited to 'repo')
-rwxr-xr-x | repo | 12 |
1 files changed, 4 insertions, 8 deletions
@@ -124,7 +124,7 @@ if not REPO_REV: | |||
124 | BUG_URL = "https://issues.gerritcodereview.com/issues/new?component=1370071" | 124 | BUG_URL = "https://issues.gerritcodereview.com/issues/new?component=1370071" |
125 | 125 | ||
126 | # increment this whenever we make important changes to this script | 126 | # increment this whenever we make important changes to this script |
127 | VERSION = (2, 50) | 127 | VERSION = (2, 54) |
128 | 128 | ||
129 | # increment this if the MAINTAINER_KEYS block is modified | 129 | # increment this if the MAINTAINER_KEYS block is modified |
130 | KEYRING_VERSION = (2, 3) | 130 | KEYRING_VERSION = (2, 3) |
@@ -483,11 +483,6 @@ def InitParser(parser): | |||
483 | 483 | ||
484 | 484 | ||
485 | # This is a poor replacement for subprocess.run until we require Python 3.6+. | 485 | # This is a poor replacement for subprocess.run until we require Python 3.6+. |
486 | RunResult = collections.namedtuple( | ||
487 | "RunResult", ("returncode", "stdout", "stderr") | ||
488 | ) | ||
489 | |||
490 | |||
491 | class RunError(Exception): | 486 | class RunError(Exception): |
492 | """Error when running a command failed.""" | 487 | """Error when running a command failed.""" |
493 | 488 | ||
@@ -526,7 +521,9 @@ def run_command(cmd, **kwargs): | |||
526 | elif stderr == subprocess.STDOUT: | 521 | elif stderr == subprocess.STDOUT: |
527 | dbg += " 2>&1" | 522 | dbg += " 2>&1" |
528 | trace.print(dbg) | 523 | trace.print(dbg) |
529 | ret = RunResult(proc.returncode, decode(stdout), decode(stderr)) | 524 | ret = subprocess.CompletedProcess( |
525 | cmd, proc.returncode, decode(stdout), decode(stderr) | ||
526 | ) | ||
530 | 527 | ||
531 | # If things failed, print useful debugging output. | 528 | # If things failed, print useful debugging output. |
532 | if check and ret.returncode: | 529 | if check and ret.returncode: |
@@ -553,7 +550,6 @@ def run_command(cmd, **kwargs): | |||
553 | 550 | ||
554 | 551 | ||
555 | class CloneFailure(Exception): | 552 | class CloneFailure(Exception): |
556 | |||
557 | """Indicate the remote clone of repo itself failed.""" | 553 | """Indicate the remote clone of repo itself failed.""" |
558 | 554 | ||
559 | 555 | ||