From 22c34066590651da602f3f8efdd3691d21bb3ece Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Wed, 19 Oct 2022 07:51:03 +0200 Subject: [PATCH] [FIX] forwardport: error reporting when git command fails - if stderr was empty or had been redirected to stdout, no useful information would be show, making debugging more complicated - the fallback is the error itself, but since it's reraised odds are pretty high the caller will eventually log the error itself, so it's redundant => fallback to stdout if stderr is empty, and only log if either is non-empty --- forwardport/models/project.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/forwardport/models/project.py b/forwardport/models/project.py index 4e921b92..260f3522 100644 --- a/forwardport/models/project.py +++ b/forwardport/models/project.py @@ -1146,7 +1146,8 @@ class Repo: try: return self._opener(args, **opts) except subprocess.CalledProcessError as e: - _logger.error("git call error:%s", ('\n' + e.stderr.decode()) if e.stderr else e ) + stream = e.stderr if e.stderr else e.stdout if e.stdout else '' + _logger.error("git call error%s%s", stream and ': ', stream) raise def stdout(self, flag=True):