revi-archive/llvm-premerge-checks
1
0
Fork 0
Code Activity

log git apply output in case of error

Browse source
This commit is contained in:
Mikhail Goncharov 2020-11-04 09:34:32 +01:00
parent 90e7224ba9
commit 515f086ba2
1 changed files with 2 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
scripts/patch_diff.py
View file

@ -260,6 +260,8 @@ class ApplyPatch:
proc = subprocess.run('git apply -', input=patch, shell=True, text=True, proc = subprocess.run('git apply -', input=patch, shell=True, text=True,
stdout=subprocess.PIPE, stderr=subprocess.PIPE) stdout=subprocess.PIPE, stderr=subprocess.PIPE)
if proc.returncode != 0: if proc.returncode != 0:
logging.info(proc.stdout)
logging.error(proc.stderr)
message = f":bk-status-failed: Failed to apply [{patch_file}](artifact://{patch_file}).\n\n" message = f":bk-status-failed: Failed to apply [{patch_file}](artifact://{patch_file}).\n\n"
if self.revision_id != revision['id']: if self.revision_id != revision['id']:
message += f"**Attention! D{revision['id']} is one of the dependencies of the target " \ message += f"**Attention! D{revision['id']} is one of the dependencies of the target " \