From 03bd298026e8916f9c7af61bda61528e704665ee Mon Sep 17 00:00:00 2001 From: index-git Date: Tue, 2 Nov 2021 12:15:21 +0100 Subject: [PATCH] Rename settings.MICKA_ACCEPTED_VERSIONS to settings.MICKA_ACCEPTED_VERSION --- src/layman_settings.py | 2 +- src/wait_for_deps.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/layman_settings.py b/src/layman_settings.py index 6cb645adc..3c67cbb84 100644 --- a/src/layman_settings.py +++ b/src/layman_settings.py @@ -203,7 +203,7 @@ CSW_RECORD_URL = os.getenv('CSW_RECORD_URL', None) # # tuples like (version, revision) -MICKA_ACCEPTED_VERSIONS = [ +MICKA_ACCEPTED_VERSION = [ ('2020.014', '2020-04-15.01'), ] if ':' not in os.getenv('MICKA_ACCEPTED_VERSION', '') else [ tuple(os.environ['MICKA_ACCEPTED_VERSION'].split(':')) diff --git a/src/wait_for_deps.py b/src/wait_for_deps.py index 7642c7d89..e648695e1 100644 --- a/src/wait_for_deps.py +++ b/src/wait_for_deps.py @@ -130,7 +130,7 @@ def main(): version_match = re.search(MICKA_VERSION_RE, response) assert (version_match and len(version_match.groups()) == 2), 'Unknown version of Micka!' found_version = version_match.groups() - assert found_version in settings.MICKA_ACCEPTED_VERSIONS, f"Found Micka version {found_version}, but expecting one of {settings.MICKA_ACCEPTED_VERSIONS}. Please use one of expected version, e.g. by upgrading/downgrading Micka. Take special care about Micka's database." + assert found_version in settings.MICKA_ACCEPTED_VERSION, f"Found Micka version {found_version}, but expecting one of {settings.MICKA_ACCEPTED_VERSION}. Please use one of expected version, e.g. by upgrading/downgrading Micka. Take special care about Micka's database." print(f"Found Micka version {found_version}.") print(f"Attempt {attempt}/{MAX_ATTEMPTS} successful.")