From 9d7baa1eb643b2b41aad7eb0b116c5b16a5007ee Mon Sep 17 00:00:00 2001 From: Pedro Lamas Date: Tue, 28 Dec 2021 16:06:17 +0000 Subject: [PATCH] utils: fixes minor typo Signed-off-by: Pedro Lamas --- moonraker/utils.py | 6 +++--- scripts/build_release.py | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/moonraker/utils.py b/moonraker/utils.py index 34008bf..729e13e 100644 --- a/moonraker/utils.py +++ b/moonraker/utils.py @@ -87,7 +87,7 @@ class MoonrakerLoggingHandler(logging.handlers.TimedRotatingFileHandler): # Parse the git version from the command line. This code # is borrowed from Klipper. -def retreive_git_version(source_path: str) -> str: +def retrieve_git_version(source_path: str) -> str: # Obtain version info from "git" program prog = ('git', '-C', source_path, 'describe', '--always', '--tags', '--long', '--dirty') @@ -97,13 +97,13 @@ def retreive_git_version(source_path: str) -> str: retcode = process.wait() if retcode == 0: return ver.strip().decode() - raise Exception(f"Failed to retreive git version: {err.decode()}") + raise Exception(f"Failed to retrieve git version: {err.decode()}") def get_software_version() -> str: version = "?" try: - version = retreive_git_version(MOONRAKER_PATH) + version = retrieve_git_version(MOONRAKER_PATH) except Exception: vfile = pathlib.Path(os.path.join( MOONRAKER_PATH, "moonraker/.version")) diff --git a/scripts/build_release.py b/scripts/build_release.py index 91a5a42..d9f1eb1 100644 --- a/scripts/build_release.py +++ b/scripts/build_release.py @@ -17,7 +17,7 @@ from typing import Dict, Any, List, Set, Optional MOONRAKER_PATH = os.path.abspath( os.path.join(os.path.dirname(__file__), "..")) sys.path.append(os.path.join(MOONRAKER_PATH, "moonraker")) -from utils import hash_directory, retreive_git_version # noqa:E402 +from utils import hash_directory, retrieve_git_version # noqa:E402 # Dirs and exts to ignore when calculating the repo hash IGNORE_DIRS = ["out", "lib", "test", "docs", "__pycache__"] @@ -242,7 +242,7 @@ def generate_version_info(path: str, owner_repo = OWNER_REPOS[source_dir] curtime = int(time.time()) date_str = time.strftime("%Y%m%d", time.gmtime(curtime)) - version = retreive_git_version(path) + version = retrieve_git_version(path) if release_tag is None: release_tag = version.split('-')[0] source_hash = hash_directory(path, IGNORE_EXTS, IGNORE_DIRS)