Browse Source

fix: update all error message on win

pull/113/head
dr.lt.data 1 year ago
parent
commit
f10cb735e5
  1. 18
      __init__.py
  2. 10
      git_helper.py

18
__init__.py

@ -248,12 +248,20 @@ def __win_check_git_update(path, do_fetch=False, do_update=False):
output, _ = process.communicate() output, _ = process.communicate()
output = output.decode('utf-8').strip() output = output.decode('utf-8').strip()
if "CUSTOM NODE CHECK: True" in output: if do_update:
process.wait() if "CUSTOM NODE PULL: True" in output:
return True process.wait()
return True
else:
process.wait()
return False
else: else:
process.wait() if "CUSTOM NODE CHECK: True" in output:
return False process.wait()
return True
else:
process.wait()
return False
def __win_check_git_pull(path): def __win_check_git_pull(path):

10
git_helper.py

@ -50,9 +50,13 @@ def gitpull(path):
if repo.is_dirty(): if repo.is_dirty():
repo.git.stash() repo.git.stash()
origin = repo.remote(name='origin') try:
origin.pull(rebase=True) origin = repo.remote(name='origin')
repo.git.submodule('update', '--init', '--recursive') origin.pull(rebase=True)
repo.git.submodule('update', '--init', '--recursive')
print("CUSTOM NODE PULL: True")
except Exception as e:
print("CUSTOM NODE PULL: False")
repo.close() repo.close()

Loading…
Cancel
Save