h3n3/klipper
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

util: report git version info as a dict

Browse Source 
Signed-off-by:  Eric Callahan <arksine.code@gmail.com>
This commit is contained in:
Eric Callahan
2023-05-03 06:05:37 -04:00
committed by KevinOConnor
parent b89a049fdb
commit a3eebab4f2
3 changed files with 22 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
klippy/klippy.py
View File

@@ -343,12 +343,14 @@ def main():
else:
logging.getLogger().setLevel(debuglevel)
logging.info("Starting Klippy...")
git_vers, git_status, repo_info = util.get_git_version()
extra_files = [fname for code, fname in git_status
git_info = util.get_git_version()
git_vers = git_info["version"]
extra_files = [fname for code, fname in git_info["file_status"]
if (code in ('??', '!!') and fname.endswith('.py')
and (fname.startswith('klippy/kinematics/')
or fname.startswith('klippy/extras/')))]
modified_files = [fname for code, fname in git_status if code == 'M']
modified_files = [fname for code, fname in git_info["file_status"]
if code == 'M']
extra_git_desc = ""
if extra_files:
if not git_vers.endswith('-dirty'):
@@ -360,10 +362,9 @@ def main():
if len(modified_files) > 10:
modified_files[10:] = ["(+%d files)" % (len(modified_files) - 10,)]
extra_git_desc += "\nModified files: %s" % (', '.join(modified_files),)
if repo_info:
extra_git_desc += "\nBranch: %s" % (repo_info["branch"])
extra_git_desc += "\nRemote: %s" % (repo_info["remote"])
extra_git_desc += "\nTracked URL: %s" % (repo_info["url"])
extra_git_desc += "\nBranch: %s" % (git_info["branch"])
extra_git_desc += "\nRemote: %s" % (git_info["remote"])
extra_git_desc += "\nTracked URL: %s" % (git_info["url"])
start_args['software_version'] = git_vers
start_args['cpu_info'] = util.get_cpu_info()
if bglogger is not None: