timoxa0/LoN-Deployer
Archived
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases 6 Wiki Activity

Do not use shell=True. Change FastbootException to UnauthorizedBootImage exception

Browse source
This commit is contained in:
timoxa0 2024-05-16 23:28:42 +05:00
parent fdad3b80b2
commit c97de2f2e4
1 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
lon_deployer/fastboot.py
View file

@ -7,11 +7,14 @@ import subprocess
def _fastboot_run(command: [str], serial: str = None) -> str: def _fastboot_run(command: [str], serial: str = None) -> str:
try: try:
cmd = ["fastboot"]
if not serial: if not serial:
cmd = f"fastboot {' '.join(command)}" cmd += command
else: else:
cmd = f"fastboot -s {serial} {' '.join(command)}" cmd += ["-s", serial] + command
fb_out = subprocess.check_output(cmd, stderr=subprocess.STDOUT, shell=True, timeout=60) logger.debug(f"fb-cmd: {cmd}")
fb_out = subprocess.check_output(cmd, stderr=subprocess.STDOUT, timeout=60)
logger.debug(f"fb-out: {fb_out}")
except FileNotFoundError: except FileNotFoundError:
console.log("Fastboot binary not found") console.log("Fastboot binary not found")
console.log("Exiting") console.log("Exiting")
@ -19,8 +22,6 @@ def _fastboot_run(command: [str], serial: str = None) -> str:
except subprocess.CalledProcessError: except subprocess.CalledProcessError:
raise exceptions.DeviceNotFound("Timed out") raise exceptions.DeviceNotFound("Timed out")
else: else:
logger.debug(f"fb-cmd: {cmd}")
logger.debug(f"fb-out: {fb_out}")
return fb_out.decode() return fb_out.decode()
@ -57,7 +58,7 @@ def boot_ofox(serial: str) -> None:
with console.status("[cyan]Booting", spinner="line", spinner_style="white"): with console.status("[cyan]Booting", spinner="line", spinner_style="white"):
out = _fastboot_run(["boot", ofox], serial) out = _fastboot_run(["boot", ofox], serial)
if "Failed to load/authenticate boot image: Device Error" in out: if "Failed to load/authenticate boot image: Device Error" in out:
raise exceptions.FastbootException("Failed to load/authenticate boot image: Device Error") raise exceptions.UnauthorizedBootImage("Failed to load/authenticate boot image: Device Error", out)
def flash(serial: str, part: str, data: bytes) -> None: def flash(serial: str, part: str, data: bytes) -> None: