From 2052b461afd3ff06dc30cef06e92a580e85c1a99 Mon Sep 17 00:00:00 2001 From: Yetangitu Date: Wed, 23 Jun 2021 15:46:17 +0000 Subject: [PATCH] Fix android build error when confronted with package versions ending in +revision_information The script seems to assume package version numbers always end in numeric versions with an optional alpha-suffix. Alas, were it only so simple... Sometimes the package is called fizzbang-1.2.3+release_info in which case the build fails. No more! Closes https://github.com/MusicPlayerDaemon/MPD/issues/1177 --- python/build/project.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/python/build/project.py b/python/build/project.py index a0cfa60ba..374ccdb14 100644 --- a/python/build/project.py +++ b/python/build/project.py @@ -20,7 +20,7 @@ class Project: self.base = base if name is None or version is None: - m = re.match(r'^([-\w]+)-(\d[\d.]*[a-z]?[\d.]*(?:-alpha\d+)?)$', self.base) + m = re.match(r'^([-\w]+)-(\d[\d.]*[a-z]?[\d.]*(?:-alpha\d+)?)(\+.*)?$', self.base) if name is None: name = m.group(1) if version is None: version = m.group(2)