| Index: tools/auto_bisect/bisect_utils.py
|
| diff --git a/tools/auto_bisect/bisect_utils.py b/tools/auto_bisect/bisect_utils.py
|
| index e2783e3a462ef7d41c19151a91f4bd28ddcea64a..0d7f5065f8682c73683e258284041826768bd754 100644
|
| --- a/tools/auto_bisect/bisect_utils.py
|
| +++ b/tools/auto_bisect/bisect_utils.py
|
| @@ -325,7 +325,6 @@ def RunGClientAndCreateConfig(opts, custom_deps=None, cwd=None):
|
| return return_code
|
|
|
|
|
| -
|
| def OnAccessError(func, path, _):
|
| """Error handler for shutil.rmtree.
|
|
|
| @@ -431,7 +430,7 @@ def CheckRunGit(command, cwd=None):
|
| Returns:
|
| A tuple of the output and return code.
|
| """
|
| - (output, return_code) = RunGit(command, cwd=cwd)
|
| + output, return_code = RunGit(command, cwd=cwd)
|
|
|
| assert not return_code, 'An error occurred while running'\
|
| ' "git %s"' % ' '.join(command)
|
| @@ -463,8 +462,7 @@ def CreateBisectDirectoryAndSetupDepot(opts, custom_deps):
|
| if CheckIfBisectDepotExists(opts):
|
| path_to_dir = os.path.join(os.path.abspath(opts.working_directory),
|
| BISECT_DIR, 'src')
|
| - (output, _) = RunGit(['rev-parse', '--is-inside-work-tree'],
|
| - cwd=path_to_dir)
|
| + output, _ = RunGit(['rev-parse', '--is-inside-work-tree'], cwd=path_to_dir)
|
| if output.strip() == 'true':
|
| # Before checking out master, cleanup up any leftover index.lock files.
|
| _CleanupPreviousGitRuns(path_to_dir)
|
| @@ -515,9 +513,10 @@ def RunProcessAndRetrieveOutput(command, cwd=None):
|
|
|
| # On Windows, use shell=True to get PATH interpretation.
|
| shell = IsWindowsHost()
|
| - proc = subprocess.Popen(command, shell=shell, stdout=subprocess.PIPE,
|
| + proc = subprocess.Popen(
|
| + command, shell=shell, stdout=subprocess.PIPE,
|
| stderr=subprocess.STDOUT)
|
| - (output, _) = proc.communicate()
|
| + output, _ = proc.communicate()
|
|
|
| if cwd:
|
| os.chdir(original_cwd)
|
|
|