Have a sleep if 409 on push to gh

DemocracyClub · Mar 18, 2024 · cf0ce25 · cf0ce25
1 parent 2c10181
commit cf0ce25
Showing 1 changed file with 20 additions and 6 deletions.
diff --git a/polling_stations/apps/file_uploads/models.py b/polling_stations/apps/file_uploads/models.py
@@ -1,3 +1,4 @@
+import time
 from datetime import timedelta
 
 from commitment import GitHubClient, GitHubCredentials
@@ -255,12 +256,25 @@ def make_pull_request(self):
             else:
                 raise e
 
-        client.push_file(
-            content=self.import_script,
-            filename=self.gss.import_script_path,
-            message=self.pr_title,
-            branch=self.branch_name,
-        )
+        try:
+            client.push_file(
+                content=self.import_script,
+                filename=self.gss.import_script_path,
+                message=self.pr_title,
+                branch=self.branch_name,
+            )
+        except HTTPError as e:
+            status_code = e.response.status_code
+            if status_code == 409:
+                time.sleep(10)
+                client.push_file(
+                    content=self.import_script,
+                    filename=self.gss.import_script_path,
+                    message=self.pr_title,
+                    branch=self.branch_name,
+                )
+            else:
+                raise e
 
         try:
             client.open_pull_request(