Djam/image-builder
1
0
Fork 0
mirror of https://github.com/rosalinux/image-builder.git synced 2025-02-23 18:32:51 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

add warning if patch applied

Browse source
This commit is contained in:
alexander stefanov 2024-11-15 13:13:21 +03:00
parent d509a1ba76
commit d768a00a96
1 changed files with 11 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
utils/patch.py
View file

@ -4,7 +4,6 @@
import os import os
import subprocess import subprocess
def apply_patches(patch_dir, target_dir): def apply_patches(patch_dir, target_dir):
""" """
Applies patches from the specified patch directory to the target directory using `git apply`. Applies patches from the specified patch directory to the target directory using `git apply`.
@ -26,6 +25,17 @@ def apply_patches(patch_dir, target_dir):
if os.path.isfile(patch_path): if os.path.isfile(patch_path):
print(f"Applying patch: {patch}") print(f"Applying patch: {patch}")
try: try:
check_result = subprocess.run(
["git", "apply", "--check", patch_path],
cwd=target_dir,
stdout=subprocess.PIPE,
stderr=subprocess.PIPE,
)
if check_result.returncode != 0:
print(f"Warning: Patch {patch} has already been applied or conflicts exist. Skipping.")
continue
subprocess.run(["git", "apply", patch_path], cwd=target_dir, check=True) subprocess.run(["git", "apply", patch_path], cwd=target_dir, check=True)
except subprocess.CalledProcessError as e: except subprocess.CalledProcessError as e:
print(f"Failed to apply patch {patch}: {e}") print(f"Failed to apply patch {patch}: {e}")