From c993c5068e0f7e22124b1bfb17ad0425fe2b8c83 Mon Sep 17 00:00:00 2001 From: Aravind Vasudevan Date: Thu, 14 Sep 2023 08:46:44 +0000 Subject: subcmds: Use repo logger Bug: b/292704435 Change-Id: Ia3a45d87fc0bf0d4a1ba53050d9c3cd2dba20e55 Reviewed-on: https://gerrit-review.googlesource.com/c/git-repo/+/386236 Reviewed-by: Jason Chang Commit-Queue: Aravind Vasudevan Tested-by: Aravind Vasudevan --- subcmds/init.py | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'subcmds/init.py') diff --git a/subcmds/init.py b/subcmds/init.py index 529b212b..9ac42d8e 100644 --- a/subcmds/init.py +++ b/subcmds/init.py @@ -23,9 +23,12 @@ from error import UpdateManifestError from git_command import git_require from git_command import MIN_GIT_VERSION_HARD from git_command import MIN_GIT_VERSION_SOFT +from repo_logging import RepoLogger from wrapper import Wrapper +logger = RepoLogger(__file__) + _REPO_ALLOW_SHALLOW = os.environ.get("REPO_ALLOW_SHALLOW") @@ -330,11 +333,11 @@ to update the working directory files. def Execute(self, opt, args): git_require(MIN_GIT_VERSION_HARD, fail=True) if not git_require(MIN_GIT_VERSION_SOFT): - print( - "repo: warning: git-%s+ will soon be required; please upgrade " - "your version of git to maintain support." - % (".".join(str(x) for x in MIN_GIT_VERSION_SOFT),), - file=sys.stderr, + logger.warning( + "repo: warning: git-%s+ will soon be required; " + "please upgrade your version of git to maintain " + "support.", + ".".join(str(x) for x in MIN_GIT_VERSION_SOFT), ) rp = self.manifest.repoProject @@ -357,10 +360,7 @@ to update the working directory files. ) except wrapper.CloneFailure as e: err_msg = "fatal: double check your --repo-rev setting." - print( - err_msg, - file=sys.stderr, - ) + logger.error(err_msg) self.git_event_log.ErrorEvent(err_msg) raise RepoUnhandledExceptionError(e) -- cgit v1.2.3-54-g00ecf