zdoom/zdoom-macos-deps
0
0
Fork 0
mirror of https://github.com/ZDoom/zdoom-macos-deps.git synced 2024-11-22 03:51:33 +00:00
Code Issues Projects Releases Packages Wiki Activity

aedi: hide messages about reversed or failed source code patches during dry run

Browse source
This commit is contained in:
alexey.lysiuk 2023-02-19 12:26:25 +02:00
parent 9ce2ca7811
commit 0710bc1edf
1 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
aedi/state.py
View file

@ -191,13 +191,15 @@ class BuildState:
patch_path = self.patch_path / (patch + '.diff')
assert patch_path.exists()
# Check if patch is already applied
test_arg = '--dry-run'
args = ['patch', test_arg, '--strip=1', '--input=' + str(patch_path)]
args = ['patch', '--strip=1', '--input=' + str(patch_path)]
if subprocess.run(args, cwd=extract_path, env=self.environment).returncode == 0:
# Check if patch is already applied
dry_run_args = args + ['--dry-run', '--force']
dry_run = subprocess.run(dry_run_args, cwd=extract_path, env=self.environment,
stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL)
if dry_run.returncode == 0:
# Patch wasn't applied yet, do it now
args.remove(test_arg)
subprocess.run(args, check=True, cwd=extract_path, env=self.environment)
def run_pkg_config(self, *args) -> str: