mirror of https://github.com/vladmandic/automatic
parent
5121356ab1
commit
7ba9d261fd
|
|
@ -512,20 +512,20 @@ def update(folder, keep_branch = False, rebase = True, restart = False):
|
|||
arg = '--rebase --force' if rebase else ''
|
||||
if keep_branch:
|
||||
res = git(f'pull {arg}', folder)
|
||||
log.trace(f'Install update: folder={folder} args={arg} {res}')
|
||||
debug(f'Install update: folder={folder} args={arg} {res}')
|
||||
else:
|
||||
b = branch(folder)
|
||||
if branch is None:
|
||||
res = git(f'pull {arg}', folder)
|
||||
log.trace(f'Install update: folder={folder} branch={b} args={arg} {res}')
|
||||
debug(f'Install update: folder={folder} branch={b} args={arg} {res}')
|
||||
else:
|
||||
res = git(f'pull origin {b} {arg}', folder)
|
||||
log.trace(f'Install update: folder={folder} branch={b} args={arg} {res}')
|
||||
debug(f'Install update: folder={folder} branch={b} args={arg} {res}')
|
||||
if not args.experimental:
|
||||
commit = extensions_commit.get(os.path.basename(folder), None)
|
||||
if commit is not None:
|
||||
res = git(f'checkout {commit}', folder)
|
||||
log.trace(f'Install update: folder={folder} branch={b} args={arg} commit={commit} {res}')
|
||||
debug(f'Install update: folder={folder} branch={b} args={arg} commit={commit} {res}')
|
||||
if restart:
|
||||
log.critical('Restarting application to apply updates...')
|
||||
os.execv(sys.executable, ['python'] + sys.argv)
|
||||
|
|
|
|||
Loading…
Reference in New Issue