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

update_manager: report full version string for git repos 

Signed-off-by:  Eric Callahan <arksine.code@gmail.com>
This commit is contained in:
Arksine 2021-04-09 12:44:30 -04:00
parent b111e3d6c7
commit 7d3bba75e1
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
moonraker/components/update_manager.py
View File

@ -830,6 +830,7 @@ class GitRepo:
self.current_commit = "?" self.current_commit = "?"
self.upstream_commit = "?" self.upstream_commit = "?"
self.upstream_url = "?" self.upstream_url = "?"
self.full_version_string = "?"
self.branches = [] self.branches = []
self.dirty = False self.dirty = False
self.head_detached = False self.head_detached = False
@ -885,6 +886,7 @@ class GitRepo:
f"{self.git_remote}/{self.git_branch}") f"{self.git_remote}/{self.git_branch}")
current_version = await self.describe( current_version = await self.describe(
"--always --tags --long --dirty") "--always --tags --long --dirty")
self.full_version_string = current_version.strip()
upstream_version = await self.describe( upstream_version = await self.describe(
f"{self.git_remote}/{self.git_branch} " f"{self.git_remote}/{self.git_branch} "
"--always --tags --long") "--always --tags --long")
@ -1185,7 +1187,8 @@ class GitRepo:
'is_dirty': self.dirty, 'is_dirty': self.dirty,
'detached': self.head_detached, 'detached': self.head_detached,
'commits_behind': self.commits_behind, 'commits_behind': self.commits_behind,
'git_messages': self.git_messages 'git_messages': self.git_messages,
'full_version_string': self.full_version_string
} }
def get_version(self, upstream=False): def get_version(self, upstream=False):