summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYetangitu <github-f@unternet.org>2021-06-23 15:46:17 +0000
committerMax Kellermann <max@musicpd.org>2021-06-23 20:53:46 +0200
commit2052b461afd3ff06dc30cef06e92a580e85c1a99 (patch)
tree9b079dc0e20cecdc9228933a2b4729862fa02076
parent5019bdcd5298541a191d9824b8e5c8aff9fdbca1 (diff)
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
-rw-r--r--python/build/project.py2
1 files changed, 1 insertions, 1 deletions
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)