diff --git a/fdroidserver/apksigcopier.py b/fdroidserver/apksigcopier.py index d658d570..122f8302 100644 --- a/fdroidserver/apksigcopier.py +++ b/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: 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

generated by GitLab CI Job #%s

' % (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)