projects
/
mirror
/
dsa-puppet.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
53e77a1
)
string stuff for py3
author
Peter Palfrader
<peter@palfrader.org>
Tue, 4 Jul 2017 09:39:19 +0000
(11:39 +0200)
committer
Peter Palfrader
<peter@palfrader.org>
Tue, 4 Jul 2017 09:39:19 +0000
(11:39 +0200)
modules/bacula/files/volume-purge-action
patch
|
blob
|
history
diff --git
a/modules/bacula/files/volume-purge-action
b/modules/bacula/files/volume-purge-action
index
29fe6c6
..
fc6eef7
100755
(executable)
--- 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)