From a13e3c8f9707abf8a477e7f84f4c1d967fefdc8b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20ZHOU?= Date: Mon, 24 Jan 2022 10:15:59 +0100 Subject: [PATCH 1/2] Packager will check the tag number. --- tools/packager.py | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/tools/packager.py b/tools/packager.py index a1c964f0d1..dc9e106791 100755 --- a/tools/packager.py +++ b/tools/packager.py @@ -105,6 +105,39 @@ class opts(object): usage() sys.exit(1) +if opts.update_version and opts.tag: + ret = subprocess.run(["git", "describe", "--tags"], capture_output=True) + if ret.returncode: + print(f"Unable to retrieve last tag information: {ret.returncode}") + sys.exit(1) + + last_taginfo = ret.stdout.decode("utf-8").rstrip("\n") + ret = re.search("^\d+\.\d+.", last_taginfo) + if ret is None: + print( "Unable to retrieve the version number from last tag: " + f"{last_taginfo}") + sys.exit(1) + ret = ret.group(0) + if opts.tag.find(ret) != 0: + while True: + print("╔╗ ╔╗ ╔╗") + print("║║ ║║ ║║") + print("║║ ║║ ║║") + print("╚╝ ╚╝ ╚╝") + print("╔╗ ╔╗ ╔╗") + print("╚╝ ╚╝ ╚╝") + + print( "The last tag number of the repository is not " + "compatible with the new tag number!\n" + f" Last tag: {last_taginfo}\n" + f" New tag: {opts.tag}") + res = input("Do you want to continue? (y/n) ") + + if 'n' == res: + sys.exit(1) + elif 'y' == res: + break + # remove existing deban directory BEGIN try: shutil.rmtree("debian") From 5dac5f217beb1ca405bb6a765a747e0c75935af9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20ZHOU?= Date: Mon, 24 Jan 2022 12:17:09 +0100 Subject: [PATCH 2/2] Packager will check the tag number. (Some improvement) --- tools/packager.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/packager.py b/tools/packager.py index dc9e106791..e93dc2bc4e 100755 --- a/tools/packager.py +++ b/tools/packager.py @@ -112,13 +112,13 @@ class opts(object): sys.exit(1) last_taginfo = ret.stdout.decode("utf-8").rstrip("\n") - ret = re.search("^\d+\.\d+.", last_taginfo) + ret = re.match("^\d+\.\d+\.", last_taginfo) if ret is None: print( "Unable to retrieve the version number from last tag: " f"{last_taginfo}") sys.exit(1) ret = ret.group(0) - if opts.tag.find(ret) != 0: + if not opts.tag.startswith(ret): while True: print("╔╗ ╔╗ ╔╗") print("║║ ║║ ║║")