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

Revert "Use generic MISSING helper"

Browse Source 
This reverts commit 31a24e1652.
This commit is contained in:
Ivan Kravets
2022-07-12 22:06:29 +03:00
parent f070399cad
commit dcc02c3e14
2 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -30,7 +30,7 @@ from SCons.Script import DefaultEnvironment # pylint: disable=import-error
from platformio import exception, fs from platformio import exception, fs
from platformio.builder.tools import platformio as piotool from platformio.builder.tools import platformio as piotool
from platformio.compat import IS_WINDOWS, MISSING, hashlib_encode_data, string_types from platformio.compat import IS_WINDOWS, hashlib_encode_data, string_types
from platformio.http import HTTPClientError, InternetIsOffline from platformio.http import HTTPClientError, InternetIsOffline
from platformio.package.exception import ( from platformio.package.exception import (
MissingPackageManifestError, MissingPackageManifestError,
@ -576,10 +576,11 @@ class ArduinoLibBuilder(LibBuilderBase):
# pylint: disable=no-member # pylint: disable=no-member
if not self._manifest.get("dependencies"): if not self._manifest.get("dependencies"):
return LibBuilderBase.lib_ldf_mode.fget(self) return LibBuilderBase.lib_ldf_mode.fget(self)
missing = object()
global_value = self.env.GetProjectConfig().getraw( global_value = self.env.GetProjectConfig().getraw(
"env:" + self.env["PIOENV"], "lib_ldf_mode", MISSING "env:" + self.env["PIOENV"], "lib_ldf_mode", missing
) )
if global_value != MISSING: if global_value != missing:
return LibBuilderBase.lib_ldf_mode.fget(self) return LibBuilderBase.lib_ldf_mode.fget(self)
# automatically enable C++ Preprocessing in runtime # automatically enable C++ Preprocessing in runtime
# (Arduino IDE has this behavior) # (Arduino IDE has this behavior)
@ -831,10 +832,11 @@ class PlatformIOLibBuilder(LibBuilderBase):
@property @property
def lib_archive(self): def lib_archive(self):
missing = object()
global_value = self.env.GetProjectConfig().getraw( global_value = self.env.GetProjectConfig().getraw(
"env:" + self.env["PIOENV"], "lib_archive", MISSING "env:" + self.env["PIOENV"], "lib_archive", missing
) )
if global_value != MISSING: if global_value != missing:
return self.env.GetProjectConfig().get( return self.env.GetProjectConfig().get(
"env:" + self.env["PIOENV"], "lib_archive" "env:" + self.env["PIOENV"], "lib_archive"
) )

7
platformio/debug/config/base.py
View File

@ -16,7 +16,7 @@ import json
import os import os
from platformio import fs, proc, util from platformio import fs, proc, util
from platformio.compat import MISSING, string_types from platformio.compat import string_types
from platformio.debug.exception import DebugInvalidOptionsError from platformio.debug.exception import DebugInvalidOptionsError
from platformio.project.config import ProjectConfig from platformio.project.config import ProjectConfig
from platformio.project.helpers import load_build_metadata from platformio.project.helpers import load_build_metadata
@ -96,8 +96,9 @@ class DebugConfigBase: # pylint: disable=too-many-instance-attributes
@property @property
def init_break(self): def init_break(self):
result = self.env_options.get("debug_init_break", MISSING) missed = object()
if result != MISSING: result = self.env_options.get("debug_init_break", missed)
if result != missed:
return result return result
result = None result = None
if not result: if not result: