From a093e7db45f847e43904195ed3fb974ecff437a5 Mon Sep 17 00:00:00 2001
From: Pierre-Yves Chibon <pingou@pingoured.fr>
Date: Nov 23 2018 09:43:22 +0000
Subject: Catch exception thrown by merge_pull_request


Let's catch these exception and just ignore them, they will be thrown
elsewhere and in the tasks we can't do anything about it anyway

Signed-off-by: Pierre-Yves Chibon <pingou@pingoured.fr>

---

diff --git a/pagure/lib/tasks.py b/pagure/lib/tasks.py
index 28546b9..df5b31e 100644
--- a/pagure/lib/tasks.py
+++ b/pagure/lib/tasks.py
@@ -881,12 +881,12 @@ def update_pull_request(self, session, pr_uid):
             request.id,
         )
 
-        merge_status = pagure.lib.git.merge_pull_request(
-            session=session,
-            request=request,
-            username=None,
-            domerge=False,
-        )
+        try:
+            pagure.lib.git.merge_pull_request(
+                session=session, request=request, username=None, domerge=False
+            )
+        except pagure.exceptions.PagureException as err:
+            _log.debug(err)
 
 
 @conn.task(queue=pagure_config.get("MEDIUM_CELERY_QUEUE", None), bind=True)