From fff4abb02432e353b366d21a2b91fb06abcd29c6 Mon Sep 17 00:00:00 2001 From: Ivan Zorin Date: Thu, 3 Aug 2023 14:41:51 +0300 Subject: [PATCH] make_translation.py: simplify check for SHA ID env var / code review --- Translations/make_translation.py | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/Translations/make_translation.py b/Translations/make_translation.py index 004c5b7996..2f883acf24 100755 --- a/Translations/make_translation.py +++ b/Translations/make_translation.py @@ -1266,11 +1266,8 @@ def get_translation_sanity_checks_text(defs: dict) -> str: def get_version_suffix(ver) -> str: # Check env var from push.yml first: # - if it's pull request then use vX.YY + C.ID for version line as in *C*I with proper tag instead of merge tag for detached tree - try: - if os.environ["GITHUB_CI_PR_SHA"] != "": - return "C" + "." + os.environ["GITHUB_CI_PR_SHA"][:8].upper() - except KeyError: - True + if os.environ.get("GITHUB_CI_PR_SHA", None) is not None: + return "C" + "." + os.environ["GITHUB_CI_PR_SHA"][:8].upper() # - no github PR SHA ID, hence keep checking suffix = str("")