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

update_manager: add "primary_branch" option 

Git clients may specify a branch other than "master" as the primary to pass the validation checks.

Signed-off-by:  Eric Callahan <arksine.code@gmail.com>
This commit is contained in:
Arksine 2021-03-16 10:33:27 -04:00
parent 62265fd086
commit 4b89de53f7
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
moonraker/plugins/update_manager.py
View File

@ -449,6 +449,7 @@ class GitUpdater:
self.name = config.get_name().split()[-1] self.name = config.get_name().split()[-1]
if path is None: if path is None:
path = os.path.expanduser(config.get('path')) path = os.path.expanduser(config.get('path'))
self.primary_branch = config.get("primary_branch", "master")
self.repo_path = path self.repo_path = path
self.repo = GitRepo(cmd_helper, path, self.name) self.repo = GitRepo(cmd_helper, path, self.name)
self.init_evt = Event() self.init_evt = Event()
@ -547,7 +548,7 @@ class GitUpdater:
async def _update_repo_state(self, need_fetch=True): async def _update_repo_state(self, need_fetch=True):
self.is_valid = False self.is_valid = False
await self.repo.initialize(need_fetch=need_fetch) await self.repo.initialize(need_fetch=need_fetch)
invalids = self.repo.report_invalids(self.origin) invalids = self.repo.report_invalids(self.origin, self.primary_branch)
if invalids: if invalids:
msgs = '\n'.join(invalids) msgs = '\n'.join(invalids)
self._log_info( self._log_info(
@ -914,16 +915,17 @@ class GitRepo:
f"Is Detached: {self.head_detached}\n" f"Is Detached: {self.head_detached}\n"
f"Commits Behind: {len(self.commits_behind)}") f"Commits Behind: {len(self.commits_behind)}")
def report_invalids(self, valid_origin): def report_invalids(self, valid_origin, primary_branch):
invalids = [] invalids = []
upstream_url = self.upstream_url.lower() upstream_url = self.upstream_url.lower()
if upstream_url[-4:] != ".git": if upstream_url[-4:] != ".git":
upstream_url += ".git" upstream_url += ".git"
if upstream_url != valid_origin: if upstream_url != valid_origin:
invalids.append(f"Unofficial remote url: {self.upstream_url}") invalids.append(f"Unofficial remote url: {self.upstream_url}")
if self.git_branch != "master" or self.git_remote != "origin": if self.git_branch != primary_branch or self.git_remote != "origin":
invalids.append( invalids.append(
"Repo not on default remote branch: " "Repo not on valid remote branch, expected: "
f"origin/{primary_branch}, detected: "
f"{self.git_remote}/{self.git_branch}") f"{self.git_remote}/{self.git_branch}")
if self.head_detached: if self.head_detached:
invalids.append("Detached HEAD detected") invalids.append("Detached HEAD detected")