| Message ID | 20241022105614.839199-11-alex.bennee@linaro.org |
|---|---|
| State | New |
| Headers | show |
| Series | maintainer updates (testing, gdbstub, plugins) | expand |
On Tue, Oct 22, 2024 at 11:56:04AM +0100, Alex Bennée wrote: > When git fails the rather terse backtrace only indicates it failed > without some useful context. Add some to make the log a little more > useful. > > Signed-off-by: Alex Bennée <alex.bennee@linaro.org> > --- > .gitlab-ci.d/check-dco.py | 9 +++++---- > .gitlab-ci.d/check-patch.py | 9 +++++---- > 2 files changed, 10 insertions(+), 8 deletions(-) > > diff --git a/.gitlab-ci.d/check-dco.py b/.gitlab-ci.d/check-dco.py > index 632c8bcce8..d29c580d63 100755 > --- a/.gitlab-ci.d/check-dco.py > +++ b/.gitlab-ci.d/check-dco.py > @@ -19,10 +19,11 @@ > reponame = os.path.basename(cwd) > repourl = "https://gitlab.com/%s/%s.git" % (namespace, reponame) > > -subprocess.check_call(["git", "remote", "add", "check-dco", repourl]) > -subprocess.check_call(["git", "fetch", "check-dco", "master"], > - stdout=subprocess.DEVNULL, > - stderr=subprocess.DEVNULL) > +print(f"adding upstream git repo @ {repourl}") > +subprocess.run(["git", "remote", "add", "check-dco", repourl], > + check=True, capture_output=True) > +subprocess.run(["git", "fetch", "check-dco", "master"], > + check=True, capture_output=True) This is effectively no change - 'capture_output' means stderr/out are captured into a buffer which subprocess.run returns, but you're not using the return value so the captured output is invisible. If we want to see errors, then just remove the stderr/stdout args from the check_call function, so they're no longer sent to /dev/null With regards, Daniel
On 22/10/2024 12.56, Alex Bennée wrote: > When git fails the rather terse backtrace only indicates it failed > without some useful context. Add some to make the log a little more > useful. > > Signed-off-by: Alex Bennée <alex.bennee@linaro.org> > --- > .gitlab-ci.d/check-dco.py | 9 +++++---- > .gitlab-ci.d/check-patch.py | 9 +++++---- > 2 files changed, 10 insertions(+), 8 deletions(-) Reviewed-by: Thomas Huth <thuth@redhat.com>
diff --git a/.gitlab-ci.d/check-dco.py b/.gitlab-ci.d/check-dco.py index 632c8bcce8..d29c580d63 100755 --- a/.gitlab-ci.d/check-dco.py +++ b/.gitlab-ci.d/check-dco.py @@ -19,10 +19,11 @@ reponame = os.path.basename(cwd) repourl = "https://gitlab.com/%s/%s.git" % (namespace, reponame) -subprocess.check_call(["git", "remote", "add", "check-dco", repourl]) -subprocess.check_call(["git", "fetch", "check-dco", "master"], - stdout=subprocess.DEVNULL, - stderr=subprocess.DEVNULL) +print(f"adding upstream git repo @ {repourl}") +subprocess.run(["git", "remote", "add", "check-dco", repourl], + check=True, capture_output=True) +subprocess.run(["git", "fetch", "check-dco", "master"], + check=True, capture_output=True) ancestor = subprocess.check_output(["git", "merge-base", "check-dco/master", "HEAD"], diff --git a/.gitlab-ci.d/check-patch.py b/.gitlab-ci.d/check-patch.py index 39e2b403c9..94afdce555 100755 --- a/.gitlab-ci.d/check-patch.py +++ b/.gitlab-ci.d/check-patch.py @@ -19,13 +19,14 @@ reponame = os.path.basename(cwd) repourl = "https://gitlab.com/%s/%s.git" % (namespace, reponame) +print(f"adding upstream git repo @ {repourl}") # GitLab CI environment does not give us any direct info about the # base for the user's branch. We thus need to figure out a common # ancestor between the user's branch and current git master. -subprocess.check_call(["git", "remote", "add", "check-patch", repourl]) -subprocess.check_call(["git", "fetch", "check-patch", "master"], - stdout=subprocess.DEVNULL, - stderr=subprocess.DEVNULL) +subprocess.run(["git", "remote", "add", "check-patch", repourl], + check=True, capture_output=True) +subprocess.run(["git", "fetch", "check-patch", "master"], + check=True, capture_output=True) ancestor = subprocess.check_output(["git", "merge-base", "check-patch/master", "HEAD"],
When git fails the rather terse backtrace only indicates it failed without some useful context. Add some to make the log a little more useful. Signed-off-by: Alex Bennée <alex.bennee@linaro.org> --- .gitlab-ci.d/check-dco.py | 9 +++++---- .gitlab-ci.d/check-patch.py | 9 +++++---- 2 files changed, 10 insertions(+), 8 deletions(-)