From: Douglas Bagnall Date: Fri, 26 Oct 2018 07:40:16 +0000 (+1300) Subject: samba-tool user: fix message format X-Git-Tag: tdb-1.3.17~1034 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ced6b6c9dd8b1d4952aef5147131b8f485c1410c;p=thirdparty%2Fsamba.git samba-tool user: fix message format There were 2 % formats and 3 arguments. Also reformat for line length Signed-off-by: Douglas Bagnall Reviewed-by: Noel Power --- diff --git a/python/samba/netcmd/user.py b/python/samba/netcmd/user.py index 90828cbfb7a..0b8314dd1ca 100644 --- a/python/samba/netcmd/user.py +++ b/python/samba/netcmd/user.py @@ -2083,9 +2083,10 @@ samba-tool user syncpasswords --terminate \\ break time.sleep(1) if not got_exclusive: - log_msg("update_pid(%r): failed to get exclusive lock[%s] - %s" % + log_msg("update_pid(%r): failed to get exclusive lock[%s]" % (pid, self.lockfile)) - raise CommandError("update_pid(%r): failed to get exclusive lock[%s] after 5 seconds" % + raise CommandError("update_pid(%r): failed to get " + "exclusive lock[%s] after 5 seconds" % (pid, self.lockfile)) if pid is not None: