From 3f3b92742679c0dfdf75794f45ef526a133fdc90 Mon Sep 17 00:00:00 2001 From: Peter Palfrader Date: Tue, 4 Jul 2017 11:39:19 +0200 Subject: [PATCH] string stuff for py3 --- modules/bacula/files/volume-purge-action | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/modules/bacula/files/volume-purge-action b/modules/bacula/files/volume-purge-action index 29fe6c6e0..fc6eef7d0 100755 --- a/modules/bacula/files/volume-purge-action +++ b/modules/bacula/files/volume-purge-action @@ -75,8 +75,12 @@ if p.returncode != 0: raise Exception("bconsole failed. stdout:\n%s\nstderr:%s\n"%(out, err)) if args.verbose: - print("stdout:\n%s"%(out,)) + print("stdout:\n") + sys.stdout.buffer.write(out) + print("\n") -if err != "": - print("bconsole said on stderr:\n%s\n"%(err,), file=sys.stderr) +if err != b"": + print("bconsole said on stderr:\n", file=sys.stderr) + sys.stderr.buffer.write(out) + print("", file=sys.stderr) sys.exit(1) -- 2.20.1