From 460dffe82bdd2fd6c2b0ef5c0c849f455b9ed0f9 Mon Sep 17 00:00:00 2001
From: Jochen Sprickerhof <git@jochen.sprickerhof.de>
Date: Thu, 30 Dec 2021 10:00:46 +0100
Subject: [PATCH] Don't open second MR for gradle (Closes: #914)

Traceback (most recent call last):
  File "/builds/fdroid/fdroidserver/./tests/gradle-release-checksums.py", line 130, in <module>
    mr = project.mergerequests.create({
  File "/usr/lib/python3/dist-packages/gitlab/exceptions.py", line 281, in wrapped_f
    raise error(e.error_message, e.response_code, e.response_body) from e
gitlab.exceptions.GitlabCreateError: 409: ['Another open merge request already exists for this source branch: !1064']
---
 tests/gradle-release-checksums.py | 23 +++++++++++++----------
 1 file changed, 13 insertions(+), 10 deletions(-)

diff --git a/tests/gradle-release-checksums.py b/tests/gradle-release-checksums.py
index 35b2d99f..ba787d81 100755
--- a/tests/gradle-release-checksums.py
+++ b/tests/gradle-release-checksums.py
@@ -127,13 +127,16 @@ if git_repo.is_dirty() and ('gradlew-fdroid' in modified or 'makebuildserver' in
         '\n\n<p><small>generated by <a href="%s/-/jobs/%s">GitLab CI Job #%s</a></small></p>'
         % (os.getenv('CI_PROJECT_URL'), os.getenv('CI_JOB_ID'), os.getenv('CI_JOB_ID'))
     )
-    mr = project.mergerequests.create({
-        'source_branch': branch.name,
-        'target_project_id': 36527,  # fdroid/fdroidserver
-        'target_branch': 'master',
-        'title': 'update to gradle v' + version,
-        'description': description,
-        'labels': ['fdroid-bot', 'gradle'],
-        'remove_source_branch': True,
-    })
-    mr.save()
+    try:
+        mr = project.mergerequests.create({
+            'source_branch': branch.name,
+            'target_project_id': 36527,  # fdroid/fdroidserver
+            'target_branch': 'master',
+            'title': 'update to gradle v' + version,
+            'description': description,
+            'labels': ['fdroid-bot', 'gradle'],
+            'remove_source_branch': True,
+        })
+        mr.save()
+    except gitlab.exceptions.GitlabCreateError as e:
+        print(e.error_message)