From 2b0a2ea6df73ae186da14b082e73733e0d02c41b Mon Sep 17 00:00:00 2001 From: rdb Date: Mon, 19 Aug 2019 21:57:49 +0200 Subject: [PATCH] makepanda: allow passing in more than 3 digits in version number --- makepanda/makepackage.py | 2 +- makepanda/makepanda.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/makepanda/makepackage.py b/makepanda/makepackage.py index 4c84983045..1094609374 100755 --- a/makepanda/makepackage.py +++ b/makepanda/makepackage.py @@ -1071,7 +1071,7 @@ if __name__ == "__main__": PkgDisable(pkg) # Parse the version. - match = re.match(r'^\d+\.\d+\.\d+', options.version) + match = re.match(r'^\d+\.\d+(\.\d+)+', options.version) if not match: exit("version requires three digits") diff --git a/makepanda/makepanda.py b/makepanda/makepanda.py index ffa7c4d6e8..9013c80c55 100755 --- a/makepanda/makepanda.py +++ b/makepanda/makepanda.py @@ -225,7 +225,7 @@ def parseopts(args): elif (option=="--arch"): target_arch = value.strip() elif (option=="--nocolor"): DisableColors() elif (option=="--version"): - match = re.match(r'^\d+\.\d+\.\d+', value) + match = re.match(r'^\d+\.\d+(\.\d+)+', value) if not match: usage("version requires three digits") WHLVERSION = value