From a9f9f4ef045d44863792b5fbc820baa3c9eea886 Mon Sep 17 00:00:00 2001 From: Ivan Kravets Date: Tue, 12 Nov 2019 23:52:43 +0200 Subject: [PATCH] Fixed an issue when ``env.BoardConfig()`` does not work for custom boards in extra scripts of libraries // Resolve #3264 --- platformio/builder/tools/pioplatform.py | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/platformio/builder/tools/pioplatform.py b/platformio/builder/tools/pioplatform.py index a7fbb8b9..f7a085df 100644 --- a/platformio/builder/tools/pioplatform.py +++ b/platformio/builder/tools/pioplatform.py @@ -40,16 +40,15 @@ def PioPlatform(env): def BoardConfig(env, board=None): - p = env.PioPlatform() - try: - board = board or env.get("BOARD") - assert board, "BoardConfig: Board is not defined" - with fs.cd(env.subst("$PROJECT_DIR")): - config = p.board_config(board) - except (AssertionError, exception.UnknownBoard) as e: - sys.stderr.write("Error: %s\n" % str(e)) - env.Exit(1) - return config + with fs.cd(env.subst("$PROJECT_DIR")): + try: + p = env.PioPlatform() + board = board or env.get("BOARD") + assert board, "BoardConfig: Board is not defined" + return p.board_config(board) + except (AssertionError, exception.UnknownBoard) as e: + sys.stderr.write("Error: %s\n" % str(e)) + env.Exit(1) def GetFrameworkScript(env, framework):