Skip to content

Commit

Permalink
Fixed an issue when lib_archive = no was not honored in "platformio…
Browse files Browse the repository at this point in the history
….ini"
  • Loading branch information
ivankravets committed Mar 20, 2020
1 parent 20023f8 commit d32312e
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 2 deletions.
3 changes: 2 additions & 1 deletion HISTORY.rst
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,8 @@ PlatformIO Core 4
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)
~~~~~~~~~~~~~~~~~~
Expand Down
4 changes: 3 additions & 1 deletion platformio/builder/tools/piolib.py
Original file line number Diff line number Diff line change
Expand Up @@ -723,7 +723,9 @@ def lib_archive(self):
"env:" + self.env["PIOENV"], "lib_archive", 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(
"libArchive", LibBuilderBase.lib_archive.fget(self)
)
Expand Down

0 comments on commit d32312e

Please sign in to comment.