sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-03 01:18:10 +03:00
Code

script/autobuild.py: let cleanup() ignore errors from rmdir_force() by default

Browse Source 
It's not useful to generate a python backtrace from within the cleanup code.

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Ralph Boehme <slow@samba.org>

Autobuild-User(master): Stefan Metzmacher <metze@samba.org>
Autobuild-Date(master): Wed Jan 27 18:17:17 UTC 2021 on sn-devel-184
This commit is contained in:
Stefan Metzmacher 2020-11-20 09:20:14 +00:00
parent 7a5df2deaa
commit 9883ac4593
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
script/autobuild.py
View File

@ -1045,14 +1045,23 @@ class buildlist(object):
self.tail_proc = Popen(cmd, close_fds=True)
def cleanup():
def cleanup(do_raise=False):
if options.nocleanup:
return
run_cmd("stat %s || true" % test_tmpdir, show=True)
run_cmd("stat %s" % testbase, show=True)
do_print("Cleaning up %r" % cleanup_list)
for d in cleanup_list:
rmdir_force(d)
ok = rmdir_force(d, re_raise=False)
if ok:
continue
if os.path.isdir(d):
do_print("Killing, waiting and retry")
run_cmd("killbysubdir %s > /dev/null 2>&1" % d, checkfail=False)
else:
do_print("Waiting and retry")
time.sleep(1)
rmdir_force(d, re_raise=do_raise)
def daemonize(logfile):
@ -1318,7 +1327,7 @@ while True:
(status, failed_task, failed_stage, failed_tag, errstr) = blist.run()
if status != 0 or errstr != "retry":
break
cleanup()
cleanup(do_raise=True)
except Exception:
cleanup()
raise