From 0d05bb97327fbcf7f42ad73910e5ea10557b5ff8 Mon Sep 17 00:00:00 2001 From: Peter Barker Date: Fri, 21 May 2021 10:57:15 +1000 Subject: [PATCH] Revert "waf: list boards 1/line in case of board-not-found error" This reverts commit 8ab74d9462e1063ac6908e8f70e86cf23c1d03d7. This broke the build server which parses the output of this --- Tools/ardupilotwaf/boards.py | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/Tools/ardupilotwaf/boards.py b/Tools/ardupilotwaf/boards.py index 454cabad9dcc4..c94789320a0d8 100644 --- a/Tools/ardupilotwaf/boards.py +++ b/Tools/ardupilotwaf/boards.py @@ -404,11 +404,7 @@ def get_board(ctx): boards = _board_classes.keys() if not ctx.env.BOARD in boards: - 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)) + ctx.fatal("Invalid board '%s': choices are %s" % (ctx.env.BOARD, ', '.join(sorted(boards, key=str.lower)))) _board = _board_classes[ctx.env.BOARD]() return _board