mirror/bazarr
1
0
Fork 0
mirror of https://github.com/morpheus65535/bazarr synced 2024-12-25 17:17:12 +00:00
Code Issues Releases Wiki Activity

Test

Browse source
This commit is contained in:
Louis Vézina 2017-11-21 19:58:52 -05:00
parent eb500e0f17
commit e71aba1143
1 changed files with 1 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
check_update.py
View file

@ -42,6 +42,7 @@ def check_and_apply_update(repo=local_repo, remote_name='origin'):
tree, tree,
[repo.head.target, remote_id]) [repo.head.target, remote_id])
repo.state_cleanup() repo.state_cleanup()
result = 'Conflict detected when trying to update.'
else: else:
raise AssertionError('Unknown merge analysis result') raise AssertionError('Unknown merge analysis result')