platformio/platformio-core
1
0
Fork 1
mirror of https://github.com/platformio/platformio-core.git synced 2025-07-30 18:17:13 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix issue with changing working dir

Browse Source
This commit is contained in:
Ivan Kravets
2023-07-25 15:55:09 +03:00
parent a3ad3103ef
commit 33abe19831
2 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
platformio/fs.py
View File

@ -34,12 +34,10 @@ class cd:
self.prev_path = os.getcwd() self.prev_path = os.getcwd()
def __enter__(self): def __enter__(self):
if self.new_path != self.prev_path: os.chdir(self.new_path)
os.chdir(self.new_path)
def __exit__(self, etype, value, traceback): def __exit__(self, etype, value, traceback):
if self.new_path != self.prev_path: os.chdir(self.prev_path)
os.chdir(self.prev_path)
def get_source_dir(): def get_source_dir():

6
platformio/home/rpc/handlers/project.py
View File

@ -22,7 +22,7 @@ from platformio.home.rpc.handlers.base import BaseRPCHandler
from platformio.package.manager.platform import PlatformPackageManager from platformio.package.manager.platform import PlatformPackageManager
from platformio.platform.factory import PlatformFactory from platformio.platform.factory import PlatformFactory
from platformio.project.config import ProjectConfig from platformio.project.config import ProjectConfig
from platformio.project.helpers import get_project_dir, is_platformio_project from platformio.project.helpers import get_project_dir
from platformio.project.integration.generator import ProjectGenerator from platformio.project.integration.generator import ProjectGenerator
@ -111,11 +111,11 @@ class ProjectRPC(BaseRPCHandler):
@staticmethod @staticmethod
def configuration(project_dir, env): def configuration(project_dir, env):
assert is_platformio_project(project_dir)
with fs.cd(project_dir): with fs.cd(project_dir):
config = ProjectConfig.get_instance()
config.validate(envs=[env])
platform = PlatformFactory.from_env(env, autoinstall=True) platform = PlatformFactory.from_env(env, autoinstall=True)
platform_pkg = PlatformPackageManager().get_package(platform.get_dir()) platform_pkg = PlatformPackageManager().get_package(platform.get_dir())
config = ProjectConfig.get_instance()
board_id = config.get(f"env:{env}", "board", None) board_id = config.get(f"env:{env}", "board", None)
# frameworks # frameworks