diff options
| author | Jian Cai <jiancai@google.com> | 2019-12-03 15:09:30 -0800 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2019-12-07 12:46:16 +0000 |
| commit | f07dd6dab569af855200950c0370532254f38126 (patch) | |
| tree | 211e3d5a6afd23cd8b50094f2ef6e9600bee893c /llvm_tools/patch_manager.py | |
| parent | d14dcc474ac788a94984b941c31559cf8c29801e (diff) | |
| download | toolchain-utils-f07dd6dab569af855200950c0370532254f38126.tar.gz | |
LLVM tools: sync python scripts
Sync python scripts from sys-devel/llvm/files/patch_manager that fixed
broken LLVM roll builders.
BUG=chromium:1027950
TEST=local builds.
Change-Id: I0f1c7147e937d59dfe859d36aa8cfcfcbfd1fdb9
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/toolchain-utils/+/1949693
Reviewed-by: George Burgess <gbiv@chromium.org>
Commit-Queue: Jian Cai <jiancai@google.com>
Tested-by: Jian Cai <jiancai@google.com>
Diffstat (limited to 'llvm_tools/patch_manager.py')
| -rwxr-xr-x | llvm_tools/patch_manager.py | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/llvm_tools/patch_manager.py b/llvm_tools/patch_manager.py index c51ba200..870988a1 100755 --- a/llvm_tools/patch_manager.py +++ b/llvm_tools/patch_manager.py @@ -8,18 +8,18 @@ from __future__ import print_function +from collections import namedtuple +from failure_modes import FailureModes +from subprocess_helpers import check_call +from subprocess_helpers import check_output + import argparse import json +import get_llvm_hash import os import subprocess import sys -from collections import namedtuple -from failure_modes import FailureModes -from get_llvm_hash import LLVMHash -from subprocess_helpers import check_call -from subprocess_helpers import check_output - def is_directory(dir_path): """Validates that the argument passed into 'argparse' is a directory.""" @@ -151,7 +151,7 @@ def GetHEADSVNVersion(src_path): git_hash = check_output(cmd) - version = GetVersionFrom(src_path, git_hash) + version = get_llvm_hash.GetVersionFrom(src_path, git_hash.rstrip()) return version @@ -322,7 +322,7 @@ def PerformBisection(src_path, good_commit, bad_commit, svn_version, check_output(end_cmd) # `git bisect run` returns the bad commit hash and the commit message. - version = GetVersionFrom(src_path, git_hash) + version = get_llvm_hash.GetVersionFrom(src_path, git_hash) return version |