Merge branch 'fix_open_mr' into 'master'

Don't open second MR for gradle (Closes: #914)

Closes #914

See merge request fdroid/fdroidserver!1066

fdroidserver/apksigcopier.py

@@ -59,6 +59,7 @@ import zipfile
 import zlib
 
 from collections import namedtuple
+from typing import Dict, Tuple, Union
 
 __version__ = "0.4.0"
 NAME = "apksigcopier"
@@ -95,7 +96,7 @@ class ZipError(APKSigCopierError):
 class ReproducibleZipInfo(zipfile.ZipInfo):
     """Reproducible ZipInfo hack."""
 
-    _override = {}
+    _override = {}  # type: Dict[str, Union[int, Tuple[int, ...]]]
 
     def __init__(self, zinfo, **override):
         if override:

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)