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@xxxxxxxxxx> > --- > .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 -- |: https://berrange.com -o- https://www.flickr.com/photos/dberrange :| |: https://libvirt.org -o- https://fstop138.berrange.com :| |: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|
