From: Hugo van Kemenade <hugovk@users.noreply.github.com>
Date: Mon, 14 Mar 2022 13:28:57 +0000 (+0200)
Subject: CI: Fix patchcheck (GH-31708)
X-Git-Tag: v3.11.0a7~256
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=23abae621f579014eb29d5c6621f031c8a1a4057;p=thirdparty%2FPython%2Fcpython.git

CI: Fix patchcheck (GH-31708)
---

diff --git a/.azure-pipelines/posix-steps.yml b/.azure-pipelines/posix-steps.yml
index 2a3680897302..29b43e093447 100644
--- a/.azure-pipelines/posix-steps.yml
+++ b/.azure-pipelines/posix-steps.yml
@@ -66,7 +66,9 @@ steps:
         COMMAND: make
 
 - ${{ if eq(parameters.patchcheck, 'true') }}:
-  - script: ./python Tools/scripts/patchcheck.py --ci true
+  - script: |
+      git fetch origin
+      ./python Tools/scripts/patchcheck.py --ci true
     displayName: 'Run patchcheck.py'
     condition: and(succeeded(), eq(variables['Build.Reason'], 'PullRequest'))
 
diff --git a/Tools/scripts/patchcheck.py b/Tools/scripts/patchcheck.py
index 4cab66c8e97b..a324eafc52b2 100755
--- a/Tools/scripts/patchcheck.py
+++ b/Tools/scripts/patchcheck.py
@@ -130,6 +130,8 @@ def changed_files(base_branch=None):
         with subprocess.Popen(cmd.split(),
                               stdout=subprocess.PIPE,
                               cwd=SRCDIR) as st:
+            if st.wait() != 0:
+                sys.exit(f'error running {cmd}')
             for line in st.stdout:
                 line = line.decode().rstrip()
                 status_text, filename = line.split(maxsplit=1)