mirror
/
bazarr
mirror of https://github.com/morpheus65535/bazarr
1
0
Fork 0
Code Issues Releases Wiki Activity

Stop trying to restart after update

This commit is contained in:
Bazarr user 2017-12-15 22:31:50 -05:00
parent 32ef664408
commit cbba8cad74
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
check_update.py
View File

@ -29,8 +29,8 @@ def check_and_apply_update(repo=local_repo, remote_name='origin'):
master_ref = repo.lookup_reference('refs/remotes/origin/' + str(branch)) master_ref = repo.lookup_reference('refs/remotes/origin/' + str(branch))
master_ref.set_target(remote_id) master_ref.set_target(remote_id)
repo.head.set_target(remote_id) repo.head.set_target(remote_id)
logging.info('Bazarr updated to latest version and restarting.') logging.info('Bazarr updated to latest version and need to be restarted.')
os.execlp('python', 'python', os.path.join(os.path.dirname(__file__), 'bazarr.py')) #os.execlp('python', 'python', os.path.join(os.path.dirname(__file__), 'bazarr.py'))
# We can just do it normally # We can just do it normally
elif merge_result & pygit2.GIT_MERGE_ANALYSIS_NORMAL: elif merge_result & pygit2.GIT_MERGE_ANALYSIS_NORMAL:
repo.merge(remote_id) repo.merge(remote_id)
@ -47,7 +47,7 @@ def check_and_apply_update(repo=local_repo, remote_name='origin'):
[repo.head.target, remote_id]) [repo.head.target, remote_id])
repo.state_cleanup() repo.state_cleanup()
logging.error('Conflict detected when trying to update.') logging.error('Conflict detected when trying to update.')
os.execlp('python', 'python', os.path.join(os.path.dirname(__file__), 'bazarr.py')) #os.execlp('python', 'python', os.path.join(os.path.dirname(__file__), 'bazarr.py'))
# We can't do it # We can't do it
else: else:
logging.error('Bazarr cannot be updated: Unknown merge analysis result') logging.error('Bazarr cannot be updated: Unknown merge analysis result')