From: Johannes Berg <johannes@sipsolutions.net>
Date: Tue, 29 Dec 2020 21:26:40 +0000 (+0100)
Subject: restore: fix error message for inaccessible items
X-Git-Tag: 0.32~9
X-Git-Url: https://arthur.barton.de/gitweb/?p=bup.git;a=commitdiff_plain;h=13bada8e93ba38be4770fc3773d9569a759d775d

restore: fix error message for inaccessible items

This actually shows up during tests, but it's hidden as it's
an error where we _expect_ bup to fail (and don't check why).
Fix the message in this case.

Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Reviewed-by: Rob Browning <rlb@defaultvalue.org>
---

diff --git a/lib/cmd/restore-cmd.py b/lib/cmd/restore-cmd.py
index 3797724..09fb9ff 100755
--- a/lib/cmd/restore-cmd.py
+++ b/lib/cmd/restore-cmd.py
@@ -285,7 +285,7 @@ def main():
         leaf_name, leaf_item = resolved[-1]
         if not leaf_item:
             add_error('error: cannot access %r in %r'
-                      % ('/'.join(name for name, item in resolved),
+                      % (b'/'.join(name for name, item in resolved),
                          path))
             continue
         if not path_name or path_name == b'.':