From 0628ca2a558871402f9a17cc7f7a0c69d857ae19 Mon Sep 17 00:00:00 2001 From: Lukas Slebodnik Date: Fri, 18 Jan 2019 16:38:03 +0100 Subject: [PATCH] tdb: Fix compatibility of wscript with older python Traceback (most recent call last): File "tdb-1.3.17/third_party/waf/waflib/Scripting.py", line 158, in waf_entry_point run_commands() File "tdb-1.3.17/third_party/waf/waflib/Scripting.py", line 251, in run_commands ctx = run_command(cmd_name) File "tdb-1.3.17/third_party/waf/waflib/Scripting.py", line 235, in run_command ctx.execute() File "tdb-1.3.17/third_party/waf/waflib/Context.py", line 204, in execute self.recurse([os.path.dirname(g_module.root_path)]) File "tdb-1.3.17/third_party/waf/waflib/Context.py", line 286, in recurse user_function(self) File "tdb-1.3.17/wscript", line 225, in testonly cmd = "BINDIR={} {}".format(blddir, sh_test) ValueError: zero length field name in format Signed-off-by: Lukas Slebodnik Reviewed-by: Douglas Bagnall Reviewed-by: Andrew Bartlett Autobuild-User(master): Andrew Bartlett Autobuild-Date(master): Sun Jan 20 03:49:59 CET 2019 on sn-devel-144 --- lib/tdb/wscript | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/tdb/wscript b/lib/tdb/wscript index 6a6adabc4c1..2c31f696808 100644 --- a/lib/tdb/wscript +++ b/lib/tdb/wscript @@ -222,7 +222,7 @@ def testonly(ctx): sh_tests = ["test/test_tdbbackup.sh test/jenkins-be-hash.tdb"] for sh_test in sh_tests: - cmd = "BINDIR={} {}".format(blddir, sh_test) + cmd = "BINDIR=%s %s" % (blddir, sh_test) print("shell test: " + cmd) ret = samba_utils.RUN_COMMAND(cmd) if ret != 0: