Merge branch 'bugfix/otatool_imported_as_lib' into 'master'

otatool: Fix a crash when imported as external python lib

Closes IDFGH-4942

See merge request espressif/esp-idf!12862
pull/6828/head
Angus Gratton 2021-03-26 07:22:07 +00:00
commit b73b6eb5b4
1 zmienionych plików z 0 dodań i 2 usunięć

Wyświetl plik

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