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

Fixed an issue when lib_archive = no was not honored in "platformio.ini"

Browse Source
This commit is contained in:
Ivan Kravets
2020-03-20 13:34:35 +02:00
parent 20023f8d8a
commit d32312e738
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
HISTORY.rst
View File

@ -9,7 +9,8 @@ PlatformIO Core 4
4.3.1 (2020-??-??) 4.3.1 (2020-??-??)
~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~
* Fixed a "SyntaxError: 'return' with argument inside generator" for PIO Unified Debugger when Python 2.7 is used * Fixed an error "SyntaxError: 'return' with argument inside generator" for PIO Unified Debugger when Python 2.7 is used
* Fixed an issue when ``lib_archive = no`` was not honored in `"platformio.ini" <https://docs.platformio.org/page/projectconf.html>`__
4.3.0 (2020-03-19) 4.3.0 (2020-03-19)
~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~

4
platformio/builder/tools/piolib.py
View File

@ -723,7 +723,9 @@ class PlatformIOLibBuilder(LibBuilderBase):
"env:" + self.env["PIOENV"], "lib_archive", missing "env:" + self.env["PIOENV"], "lib_archive", missing
) )
if global_value != missing: if global_value != missing:
return global_value return self.env.GetProjectConfig().get(
"env:" + self.env["PIOENV"], "lib_archive"
)
return self._manifest.get("build", {}).get( return self._manifest.get("build", {}).get(
"libArchive", LibBuilderBase.lib_archive.fget(self) "libArchive", LibBuilderBase.lib_archive.fget(self)
) )