mirror/bazarr
1
0
Fork 0
mirror of https://github.com/morpheus65535/bazarr synced 2025-01-31 03:12:12 +00:00
Code Issues Releases Wiki Activity

Better error management

Browse source
This commit is contained in:
Louis Vézina 2017-11-21 16:10:20 -05:00
parent 6c5419716d
commit 9cd5a5d304
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
check_update.py
View file

@ -40,8 +40,9 @@ def check_and_apply_update(repo=local_repo, remote_name='origin'):
user,
'Merge!',
tree,
[repo.head.target, remote_master_id])
[repo.head.target, remote_id])
repo.state_cleanup()
else:
raise AssertionError('Unknown merge analysis result')
return result