From a97b15649e7e7d64db99e1e34e2fe428a404cc9f Mon Sep 17 00:00:00 2001 From: Jean-Paul Marmorat Date: Fri, 6 Nov 2020 16:07:39 +0100 Subject: [PATCH] restore: when -vv is specified, don't crash when printing paths Without the fix restore would crash like this: TypeError: can't concat str to bytes Signed-off-by: Jean-Paul Marmorat Reviewed-by: Rob Browning [rlb@defaultvalue.org: add angle brackets around email address in signed-off-by; adjust commit message] Tested-by: Rob Browning --- lib/cmd/restore-cmd.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/cmd/restore-cmd.py b/lib/cmd/restore-cmd.py index 7c8ca26..3797724 100755 --- a/lib/cmd/restore-cmd.py +++ b/lib/cmd/restore-cmd.py @@ -192,7 +192,7 @@ def restore(repo, parent_path, name, item, top, sparse, numeric_ids, owner_map, out.write(b'%s@ -> %s\n' % (fullname, meta.symlink_target)) else: if verbosity >= 2: - out.write(fullname + '\n') + out.write(fullname + b'\n') orig_cwd = os.getcwd() try: -- 2.39.2