From 8ab74d9462e1063ac6908e8f70e86cf23c1d03d7 Mon Sep 17 00:00:00 2001 From: Peter Barker Date: Mon, 17 May 2021 14:41:59 +1000 Subject: [PATCH] waf: list boards 1/line in case of board-not-found error This line is now way too long, and splitting it this way will allow the output to be grepped for likely-looking board names. --- Tools/ardupilotwaf/boards.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/Tools/ardupilotwaf/boards.py b/Tools/ardupilotwaf/boards.py index 4dc87042ee..58b9fdc655 100644 --- a/Tools/ardupilotwaf/boards.py +++ b/Tools/ardupilotwaf/boards.py @@ -404,7 +404,11 @@ Please use a replacement build as follows: boards = _board_classes.keys() if not ctx.env.BOARD in boards: - ctx.fatal("Invalid board '%s': choices are %s" % (ctx.env.BOARD, ', '.join(sorted(boards, key=str.lower)))) + ctx.fatal( + "Invalid board '%s': choices are\n%sInvalid board '%s'. Options shown above this line." % + (ctx.env.BOARD, + ''.join([" %s\n" % x for x in sorted(boards, key=str.lower)]), + ctx.env.BOARD)) _board = _board_classes[ctx.env.BOARD]() return _board