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

git_deploy: detached head verification fix 

Signed-off-by:  Eric Callahan <arksine.code@gmail.com>
This commit is contained in:
Eric Callahan 2023-08-14 08:08:22 -04:00
parent fe120952ee
commit 3d9052d711
No known key found for this signature in database
GPG Key ID: 5A1EB336DFB4C71B
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
moonraker/components/update_manager/git_deploy.py
View File

@ -366,13 +366,13 @@ class GitRepo:
# Fetch the upstream url. If the repo has been moved, # Fetch the upstream url. If the repo has been moved,
# set the new url # set the new url
self.upstream_url = await self.remote(f"get-url {self.git_remote}") self.upstream_url = await self.remote(f"get-url {self.git_remote}", True)
if await self._check_moved_origin(): if await self._check_moved_origin():
need_fetch = True need_fetch = True
if self.git_remote == "origin": if self.git_remote == "origin":
self.recovery_url = self.upstream_url self.recovery_url = self.upstream_url
else: else:
remote_list = (await self.remote("")).splitlines() remote_list = (await self.remote()).splitlines()
logging.debug( logging.debug(
f"Git Repo {self.alias}: Detected Remotes - {remote_list}" f"Git Repo {self.alias}: Detected Remotes - {remote_list}"
) )
@ -513,7 +513,7 @@ class GitRepo:
if current_branch.startswith("(HEAD detached"): if current_branch.startswith("(HEAD detached"):
self.head_detached = True self.head_detached = True
ref_name = current_branch.split()[-1][:-1] ref_name = current_branch.split()[-1][:-1]
remote_list = (await self.remote("")).splitlines() remote_list = (await self.remote()).splitlines()
for remote in remote_list: for remote in remote_list:
remote = remote.strip() remote = remote.strip()
if not remote: if not remote:
@ -568,7 +568,8 @@ class GitRepo:
f"from {self.upstream_url} to {self.origin_url}") f"from {self.upstream_url} to {self.origin_url}")
moved = True moved = True
await self.remote( await self.remote(
f"set-url {self.git_remote} {self.origin_url}") f"set-url {self.git_remote} {self.origin_url}", True
)
self.upstream_url = self.origin_url self.upstream_url = self.origin_url
if self.moved_origin_url is not None: if self.moved_origin_url is not None:
moved_origin = self.moved_origin_url.lower().strip() moved_origin = self.moved_origin_url.lower().strip()
@ -821,8 +822,8 @@ class GitRepo:
resp = await self._run_git_cmd("branch --list --no-color") resp = await self._run_git_cmd("branch --list --no-color")
return resp.strip().split("\n") return resp.strip().split("\n")
async def remote(self, command: str) -> str: async def remote(self, command: str = "", validate: bool = False) -> str:
self._verify_repo(check_remote=True) self._verify_repo(check_remote=validate)
async with self.git_operation_lock: async with self.git_operation_lock:
resp = await self._run_git_cmd( resp = await self._run_git_cmd(
f"remote {command}") f"remote {command}")