[PATCH] github PRs: waf, ms_schema.py, autobuild.py

Andrew Bartlett abartlet at samba.org
Tue Feb 21 22:01:19 UTC 2017


On Tue, 2017-02-21 at 09:39 +0100, Stefan Metzmacher wrote:
> Am 21.02.2017 um 05:15 schrieb Andrew Bartlett:
> > From 3f4ad29fcd5aa1b05bea95f791ac82e9cfaa6b57 Mon Sep 17 00:00:00
> > 2001
> > From: Ian Stakenvicius <axs at gentoo.org>
> > Date: Mon, 13 Feb 2017 12:20:27 -0500
> > Subject: [PATCH 2/3] autobuild.py: adjust 278c92126 to fix
> > submodule retval
> > 
> > commit 278c92126 added a 'stat' check on test_tmpdir in cleanup(),
> > but
> > that location (which is assigned to be a subdir of testbase) does
> > not
> > necessarily exist -- more specifically, does NOT exist on ldb,
> > talloc,
> > replace, and tevent.  Making the call to stat on test_tmpdir be
> > non-fatal
> > allows the cleanup to finish and a successful return value on the
> > autobuild run.
> > ---
> >  script/autobuild.py | 1 -
> >  1 file changed, 1 deletion(-)
> > 
> > diff --git a/script/autobuild.py b/script/autobuild.py
> > index f1d48c42c9d..5376ee7165e 100755
> > --- a/script/autobuild.py
> > +++ b/script/autobuild.py
> > @@ -455,7 +455,6 @@ class buildlist(object):
> >  def cleanup():
> >      if options.nocleanup:
> >          return
> > -    run_cmd("stat %s" % test_tmpdir, show=True)
> >      run_cmd("stat %s" % testbase, show=True)
> >      do_print("Cleaning up ....")
> >      for d in cleanup_list:
> 
> Somewhere we discussed that this should be
> changed to "stat %s || true" to just ignore any error.
> 
> I think we need to find what is removing the directory
> as it's always expected to be there! We create it before
> starting any tests and the cleanup() function is the only
> place that should remove it.

Sorry about that.

Andrew Bartlett



More information about the samba-technical mailing list