mirror of
				https://github.com/f-droid/fdroidserver.git
				synced 2025-11-04 06:30:27 +03:00 
			
		
		
		
	Merge branch 'fix_open_mr' into 'master'
Only ignore opening a second MR See merge request fdroid/fdroidserver!1068
This commit is contained in:
		
						commit
						a375bae3c9
					
				
					 1 changed files with 4 additions and 1 deletions
				
			
		| 
						 | 
				
			
			@ -139,4 +139,7 @@ if git_repo.is_dirty() and ('gradlew-fdroid' in modified or 'makebuildserver' in
 | 
			
		|||
        })
 | 
			
		||||
        mr.save()
 | 
			
		||||
    except gitlab.exceptions.GitlabCreateError as e:
 | 
			
		||||
        print(e.error_message)
 | 
			
		||||
        if e.response_code == 409:  # Another open merge request already exists for this source branch
 | 
			
		||||
            print(e.error_message)
 | 
			
		||||
        else:
 | 
			
		||||
            raise e
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue