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

update_manager: store detached remote in database 

This allows the update manager to recover the remote should the upstream remote repo change.

Signed-off-by:  Eric Callahan <arksine.code@gmail.com>
This commit is contained in:
Arksine 2021-03-14 07:37:43 -04:00
parent 91e59706fa
commit 5f741c28a5
1 changed files with 20 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
moonraker/plugins/update_manager.py
View File

@ -792,6 +792,15 @@ class GitRepo:
f"{self.git_remote}/{self.git_branch} " f"{self.git_remote}/{self.git_branch} "
"--always --tags --long") "--always --tags --long")
# Store current remote in the database if in a detached state
if self.head_detached:
database = self.server.lookup_plugin("database")
db_key = f"update_manager.git_repo_{self.alias}" \
".detached_remote"
database.insert_item(
"moonraker", db_key,
[self.current_commit, self.git_remote, self.git_branch])
# Parse GitHub Owner from URL # Parse GitHub Owner from URL
owner_match = re.match(r"https?://[^/]+/([^/]+)", self.upstream_url) owner_match = re.match(r"https?://[^/]+/([^/]+)", self.upstream_url)
self.git_owner = "?" self.git_owner = "?"
@ -861,7 +870,17 @@ class GitRepo:
if len(bparts) == 2: if len(bparts) == 2:
self.git_remote, self.git_branch = bparts self.git_remote, self.git_branch = bparts
else: else:
if self.git_remote == "?": database = self.server.lookup_plugin("database")
db_key = f"update_manager.git_repo_{self.alias}" \
".detached_remote"
detached_remote = database.get_item(
"moonraker", db_key, ("", "?"))
if detached_remote[0].startswith(branch_info):
self.git_remote = detached_remote[1]
self.git_branch = detached_remote[2]
msg = "Using remote stored in database:"\
f" {self.git_remote}/{self.git_branch}"
elif self.git_remote == "?":
msg = "Resolve by manually checking out" \ msg = "Resolve by manually checking out" \
" a branch via SSH." " a branch via SSH."
else: else: