3diy
/
moonraker
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update_manager: check local git version after an update 

Before the service is restarted, check the local version.  This should make sure that the local repo state is reported correctly after an update, regardless of the timing of a status request.

Signed-off-by:  Eric Callahan <arksine.code@gmail.com>
This commit is contained in:
Arksine 2020-12-20 06:46:52 -05:00
parent 0a7eed2767
commit 684ff07ba2
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
moonraker/plugins/update_manager.py
View File

@ -242,6 +242,11 @@ class GitUpdater:
await self.init_evt.wait(to) await self.init_evt.wait(to)
async def refresh(self): async def refresh(self):
await self._check_local_version()
await self._check_remote_version()
self.init_evt.set()
async def _check_local_version(self):
self.is_valid = False self.is_valid = False
self.cur_hash = "?" self.cur_hash = "?"
try: try:
@ -280,13 +285,8 @@ class GitUpdater:
self._log_info("Git repo not on master branch") self._log_info("Git repo not on master branch")
else: else:
self._log_info(f"Invalid git repo at path '{self.repo_path}'") self._log_info(f"Invalid git repo at path '{self.repo_path}'")
try:
await self.check_remote_version()
except Exception:
pass
self.init_evt.set()
async def check_remote_version(self): async def _check_remote_version(self):
repo_url = REPO_DATA[self.name]['repo_url'] repo_url = REPO_DATA[self.name]['repo_url']
try: try:
branch_info = await self.github_request(repo_url) branch_info = await self.github_request(repo_url)
@ -307,7 +307,7 @@ class GitUpdater:
raise self._log_exc( raise self._log_exc(
"Update aborted, repo is has been modified", False) "Update aborted, repo is has been modified", False)
if self.remote_hash == "?": if self.remote_hash == "?":
await self.check_remote_version() await self._check_remote_version()
if self.remote_hash == self.cur_hash: if self.remote_hash == self.cur_hash:
# No need to update # No need to update
return return
@ -324,6 +324,8 @@ class GitUpdater:
if update_deps: if update_deps:
await self._install_packages() await self._install_packages()
await self._update_virtualenv(need_env_rebuild) await self._update_virtualenv(need_env_rebuild)
# Refresh local repo state
await self._check_local_version()
if self.name == "moonraker": if self.name == "moonraker":
# Launch restart async so the request can return # Launch restart async so the request can return
# before the server restarts # before the server restarts