mirrors/fdroidserver
1
0
Fork 0
mirror of https://github.com/f-droid/fdroidserver.git synced 2025-09-14 15:02:51 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'fix_open_mr' into 'master'

Browse source 
Only ignore opening a second MR

See merge request fdroid/fdroidserver!1068
This commit is contained in:
Hans-Christoph Steiner 2021-12-30 19:40:22 +00:00
commit a375bae3c9
1 changed files with 4 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
tests/gradle-release-checksums.py
View file

@ -139,4 +139,7 @@ if git_repo.is_dirty() and ('gradlew-fdroid' in modified or 'makebuildserver' in
}) })
mr.save() mr.save()
except gitlab.exceptions.GitlabCreateError as e: except gitlab.exceptions.GitlabCreateError as e:
if e.response_code == 409: # Another open merge request already exists for this source branch
print(e.error_message) print(e.error_message)
else:
raise e