From f334e19ffca1066b41c29ce7e95a25fdd7d382c8 Mon Sep 17 00:00:00 2001 From: Dennis Kempin Date: Thu, 14 Apr 2022 15:41:06 -0700 Subject: [PATCH] merge bot: Do not check result of git config If the value is not set, treat it as empty. BUG=None TEST=Tested by removing the config setting locally. Change-Id: Ia160285c03bffcf7a332f3891587e7ada2228623 Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/crosvm/+/3585860 Reviewed-by: Anton Romanov Tested-by: Dennis Kempin --- tools/chromeos/merge_bot | 2 +- tools/impl/common.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/chromeos/merge_bot b/tools/chromeos/merge_bot index d6420cbe92..cedeb6ad72 100755 --- a/tools/chromeos/merge_bot +++ b/tools/chromeos/merge_bot @@ -176,7 +176,7 @@ def setup_tracking_branch(branch_name: str, tracking: str): def gerrit_prerequisites(): "Make sure we can upload to gerrit." # Make sure we have http cookies to access gerrit - cookie_file = git("config http.cookiefile").stdout() + cookie_file = git("config http.cookiefile").stdout(check=False) if not cookie_file: if is_gce_instance(): # Grab http cookies for accessing GOB. See go/gob-gce diff --git a/tools/impl/common.py b/tools/impl/common.py index ebbc8056f0..bf8ab31cdd 100644 --- a/tools/impl/common.py +++ b/tools/impl/common.py @@ -180,11 +180,11 @@ class Command(object): raise subprocess.CalledProcessError(result.returncode, str(self), result.stdout) return result.returncode - def stdout(self): + def stdout(self, check: bool = True): """ Runs a program and returns stdout. Stderr is still directed to the user. """ - return self.run(stderr=None).stdout.strip() + return self.run(stderr=None, check=check).stdout.strip() def lines(self): """