summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2020-02-28 00:00:08 +0100
committerKarolin Seeger <kseeger@samba.org>2021-03-03 10:13:11 +0000
commitf31f1e75d7f24cbad3b2bc2c0307a09b3a1f6717 (patch)
tree888c350377efdd34bb2deb5a6fb61ea84eb3a36a
parenta4ab7d474f2a5b80cf6643d099e972f7ab190215 (diff)
downloadsamba-f31f1e75d7f24cbad3b2bc2c0307a09b3a1f6717.tar.gz
script/autobuild.py: allow write_system_info commands to fail
These commands are just there as hints to debug possible problems. In order to support autobuild.py on non-linux platforms we should just ignore errors here. Signed-off-by: Stefan Metzmacher <metze@samba.org> Reviewed-by: Andrew Bartlett <abartlet@samba.org> Autobuild-User(master): Stefan Metzmacher <metze@samba.org> Autobuild-Date(master): Thu Apr 2 07:36:07 UTC 2020 on sn-devel-184 (cherry picked from commit 9b1e96197e0983a16e73ce351eac7775801736d8)
-rwxr-xr-xscript/autobuild.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/script/autobuild.py b/script/autobuild.py
index f71e0266503..e2778609cce 100755
--- a/script/autobuild.py
+++ b/script/autobuild.py
@@ -979,7 +979,10 @@ class buildlist(object):
'cc --version',
'df -m .',
'df -m %s' % testbase]:
- out = run_cmd(cmd, output=True, checkfail=False)
+ try:
+ out = run_cmd(cmd, output=True, checkfail=False)
+ except subprocess.CalledProcessError as e:
+ out = "<failed: %s>" % str(e)
print('### %s' % cmd, file=f)
print(out, file=f)
print(file=f)