adafruit-mirror/zephyr
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 9

scripts: west_commands: patch: Use subprocess cwd

Browse source 
Instead of changing directories, pass the cwd argument to the different
subprocess calls.

Signed-off-by: Pieter De Gendt <pieter.degendt@basalte.be>
This commit is contained in:
Pieter De Gendt 2025-01-03 13:29:56 +01:00 committed by Benjamin Cabé
parent 78f96a6aba
commit 4c5e74deae
1 changed files with 4 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
scripts/west_commands/patch.py
View file

@ -282,18 +282,15 @@ class Patch(WestCommand):
patched_mods.add(mod)
self.dbg(f"patching {mod}... ", end="")
origdir = os.getcwd()
os.chdir(mod_path)
apply_cmd += patch_path
apply_cmd_list.extend([patch_path])
proc = subprocess.run(apply_cmd_list)
proc = subprocess.run(apply_cmd_list, cwd=mod_path)
if proc.returncode:
self.dbg("FAIL")
self.err(proc.stderr)
failed_patch = pth
break
self.dbg("OK")
os.chdir(origdir)
if not failed_patch:
self.inf(f"{patch_count} patches applied successfully \\o/")
@ -302,7 +299,7 @@ class Patch(WestCommand):
if args.roll_back:
self.clean(args, yml, patched_mods)
self.die(f"failed to apply patch {pth}")
self.die(f"failed to apply patch {failed_patch}")
def clean(self, args, yml, mods=None):
clean_cmd = yml["clean-command"]
@ -315,16 +312,13 @@ class Patch(WestCommand):
clean_cmd_list = shlex.split(clean_cmd)
checkout_cmd_list = shlex.split(checkout_cmd)
origdir = os.getcwd()
for mod, mod_path in Patch.get_mod_paths(args, yml).items():
if mods and mod not in mods:
continue
try:
os.chdir(mod_path)
if checkout_cmd:
self.dbg(f"Running '{checkout_cmd}' in {mod}.. ", end="")
proc = subprocess.run(checkout_cmd_list, capture_output=True)
proc = subprocess.run(checkout_cmd_list, capture_output=True, cwd=mod_path)
if proc.returncode:
self.dbg("FAIL")
self.err(f"{checkout_cmd} failed for {mod}\n{proc.stderr}")
@ -333,7 +327,7 @@ class Patch(WestCommand):
if clean_cmd:
self.dbg(f"Running '{clean_cmd}' in {mod}.. ", end="")
proc = subprocess.run(clean_cmd_list, capture_output=True)
proc = subprocess.run(clean_cmd_list, capture_output=True, cwd=mod_path)
if proc.returncode:
self.dbg("FAIL")
self.err(f"{clean_cmd} failed for {mod}\n{proc.stderr}")
@ -344,8 +338,6 @@ class Patch(WestCommand):
# If this fails for some reason, just log it and continue
self.err(f"failed to clean up {mod}: {e}")
os.chdir(origdir)
def list(self, args, yml, mods=None):
patches = yml.get("patches", [])
if not patches: