feedc0de/platformio-core
1
0
Fork 0
forked from platformio/platformio-core
Code Pull Requests Activity

Fixed an issue with expanding $WORKSPACE_DIR for library manager

Browse Source
This commit is contained in:
Ivan Kravets
2020-02-29 23:08:08 +02:00
parent 7fba6f78d6
commit 2d4a3db250
1 changed files with 14 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
platformio/commands/lib.py
View File

@@ -21,7 +21,7 @@ import click
import semantic_version import semantic_version
from tabulate import tabulate from tabulate import tabulate
from platformio import exception, util from platformio import exception, fs, util
from platformio.commands import PlatformioCLI from platformio.commands import PlatformioCLI
from platformio.compat import dump_json_to_unicode from platformio.compat import dump_json_to_unicode
from platformio.managers.lib import LibraryManager, get_builtin_libs, is_builtin_lib from platformio.managers.lib import LibraryManager, get_builtin_libs, is_builtin_lib
@@ -106,17 +106,20 @@ def cli(ctx, **options):
if not is_platformio_project(storage_dir): if not is_platformio_project(storage_dir):
ctx.meta[CTX_META_STORAGE_DIRS_KEY].append(storage_dir) ctx.meta[CTX_META_STORAGE_DIRS_KEY].append(storage_dir)
continue continue
config = ProjectConfig.get_instance(os.path.join(storage_dir, "platformio.ini")) with fs.cd(storage_dir):
config.validate(options["environment"], silent=in_silence) config = ProjectConfig.get_instance(
libdeps_dir = config.get_optional_dir("libdeps") os.path.join(storage_dir, "platformio.ini")
for env in config.envs():
if options["environment"] and env not in options["environment"]:
continue
storage_dir = os.path.join(libdeps_dir, env)
ctx.meta[CTX_META_STORAGE_DIRS_KEY].append(storage_dir)
ctx.meta[CTX_META_STORAGE_LIBDEPS_KEY][storage_dir] = config.get(
"env:" + env, "lib_deps", []
) )
config.validate(options["environment"], silent=in_silence)
libdeps_dir = config.get_optional_dir("libdeps")
for env in config.envs():
if options["environment"] and env not in options["environment"]:
continue
storage_dir = os.path.join(libdeps_dir, env)
ctx.meta[CTX_META_STORAGE_DIRS_KEY].append(storage_dir)
ctx.meta[CTX_META_STORAGE_LIBDEPS_KEY][storage_dir] = config.get(
"env:" + env, "lib_deps", []
)
@cli.command("install", short_help="Install library") @cli.command("install", short_help="Install library")