help: fix for python3

Fix "bup subcommand --help" to properly compare and start
the man viewer.

Reported-by: Robert Edmonds <edmonds@debian.org>
Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Reviewed-by: Rob Browning <rlb@defaultvalue.org>
Tested-by: Rob Browning <rlb@defaultvalue.org>

diff --git a/lib/cmd/help-cmd.py b/lib/cmd/help-cmd.py
index 7448ba6d071e1943ea54ef8111aa9d41bbac2354..684df72c03ea87169fa31781df7e0157ad66f137 100755 (executable)
--- a/lib/cmd/help-cmd.py
+++ b/lib/cmd/help-cmd.py
@@ -20,6 +20,7 @@ import os, glob, sys
 sys.path[:0] = [os.path.dirname(os.path.realpath(__file__)) + '/..']
 
 from bup import compat, options, path
+from bup.compat import argv_bytes
 
 
 optspec = """
@@ -30,11 +31,11 @@ opt, flags, extra = o.parse(compat.argv[1:])
 
 if len(extra) == 0:
     # the wrapper program provides the default usage string
-    os.execvp(path.exe(), ['bup'])
+    os.execvp(path.exe(), [b'bup'])
 elif len(extra) == 1:
-    docname = (extra[0]=='bup' and 'bup' or ('bup-%s' % extra[0]))
+    docname = (extra[0]=='bup' and b'bup' or (b'bup-%s' % argv_bytes(extra[0])))
     manpath = os.path.join(path.exedir(),
-                           '../../Documentation/' + docname + '.[1-9]')
+                           b'../../Documentation/' + docname + b'.[1-9]')
     g = glob.glob(manpath)
     try:
         if g: