From 0570fc6c4889f0f9e4002078861d39f27e145c3a Mon Sep 17 00:00:00 2001 From: Ivan Kravets Date: Thu, 30 May 2019 21:56:55 +0300 Subject: [PATCH] Don't override custom "core_dir" on Windows platform --- platformio/project/helpers.py | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/platformio/project/helpers.py b/platformio/project/helpers.py index 2746c4d7..6106b0a1 100644 --- a/platformio/project/helpers.py +++ b/platformio/project/helpers.py @@ -64,12 +64,11 @@ def get_project_optional_dir(name, default=None): def get_project_core_dir(): + default = join(expanduser("~"), ".platformio") core_dir = get_project_optional_dir( - "core_dir", - get_project_optional_dir("home_dir", - join(expanduser("~"), ".platformio"))) + "core_dir", get_project_optional_dir("home_dir", default)) win_core_dir = None - if WINDOWS: + if WINDOWS and core_dir == default: win_core_dir = splitdrive(core_dir)[0] + "\\.platformio" if isdir(win_core_dir): core_dir = win_core_dir @@ -77,10 +76,12 @@ def get_project_core_dir(): if not isdir(core_dir): try: os.makedirs(core_dir) - except: # pylint: disable=bare-except + except OSError as e: if win_core_dir: os.makedirs(win_core_dir) core_dir = win_core_dir + else: + raise e assert isdir(core_dir) return core_dir