Merge branch 'bugfix/otatool_imported_as_lib_v4.3' into 'release/v4.3'

otatool: Fix a crash when imported as external python lib (v4.3)

See merge request espressif/esp-idf!13666
This commit is contained in:
Mahavir Jain
2021-07-21 05:23:12 +00:00

View File

@@ -31,7 +31,6 @@ try:
except ImportError: except ImportError:
COMPONENTS_PATH = os.path.expandvars(os.path.join('$IDF_PATH', 'components')) COMPONENTS_PATH = os.path.expandvars(os.path.join('$IDF_PATH', 'components'))
PARTTOOL_DIR = os.path.join(COMPONENTS_PATH, 'partition_table') PARTTOOL_DIR = os.path.join(COMPONENTS_PATH, 'partition_table')
sys.path.append(PARTTOOL_DIR) sys.path.append(PARTTOOL_DIR)
from parttool import PARTITION_TABLE_OFFSET, PartitionName, PartitionType, ParttoolTarget from parttool import PARTITION_TABLE_OFFSET, PartitionName, PartitionType, ParttoolTarget
@@ -101,7 +100,6 @@ class OtatoolTarget():
def switch_ota_partition(self, ota_id): def switch_ota_partition(self, ota_id):
self._check_otadata_partition() self._check_otadata_partition()
sys.path.append(PARTTOOL_DIR)
import gen_esp32part as gen import gen_esp32part as gen
def is_otadata_info_valid(status): def is_otadata_info_valid(status):