diff --git a/src/borg/archiver.py b/src/borg/archiver.py index db7738192..43a50e2e8 100644 --- a/src/borg/archiver.py +++ b/src/borg/archiver.py @@ -2013,7 +2013,12 @@ class Archiver: else: commands[args.topic].print_help() else: - parser.error('No help available on %s' % (args.topic,)) + msg_lines = [] + msg_lines += ['No help available on %s.' % args.topic] + msg_lines += ['Try one of the following:'] + msg_lines += [' Commands: %s' % ', '.join(sorted(commands.keys()))] + msg_lines += [' Topics: %s' % ', '.join(sorted(self.helptext.keys()))] + parser.error('\n'.join(msg_lines)) return self.exit_code def do_subcommand_help(self, parser, args):