mawei/dragonpilot
1
0
Fork 0
mirror of https://github.com/dragonpilot/dragonpilot.git synced 2026-06-20 21:42:05 +08:00
Code Issues Packages Projects Releases Wiki Activity

agnos.py: retry swap (#21608)

Browse Source 
* retry until success

* try this

* redirect stderr

* also check positive

* add logging

* f string
This commit is contained in:
Willem Melching
2021-07-15 16:11:10 +02:00
committed by GitHub
parent d20154e6f4
commit f4d87cecf7
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
selfdrive/hardware/tici/agnos.py
+9 -3
View File
@@ -176,13 +176,19 @@ def flash_partition(target_slot_number: int, partition: dict, cloudlog, spinner:
out.write(partition['hash_raw'].lower().encode())
def swap(manifest_path: str, target_slot_number: int) -> None:
def swap(manifest_path: str, target_slot_number: int, cloudlog) -> None:
update = json.load(open(manifest_path))
for partition in update:
if not partition.get('full_check', False):
clear_partition_hash(target_slot_number, partition)
subprocess.check_output(f"abctl --set_active {target_slot_number}", shell=True)
while True:
out = subprocess.check_output(f"abctl --set_active {target_slot_number}", shell=True, stderr=subprocess.STDOUT, encoding='utf8')
if ("No such file or directory" not in out) and ("lun as boot lun" in out):
cloudlog.info(f"Swap successfull {out}")
break
else:
cloudlog.error(f"Swap failed {out}")
def flash_agnos_update(manifest_path: str, target_slot_number: int, cloudlog, spinner: Optional[Spinner] = None) -> None:
@@ -246,6 +252,6 @@ if __name__ == "__main__":
flash_agnos_update(args.manifest, target_slot_number, logging, spinner)
logging.warning(f"Verification succeeded. Swapping to slot {target_slot_number}")
swap(args.manifest, target_slot_number)
swap(args.manifest, target_slot_number, logging)
else:
flash_agnos_update(args.manifest, target_slot_number, logging, spinner)