summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKonrad Weihmann <kweihmann@outlook.com>2020-08-08 07:51:49 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-08-12 10:53:51 +0100
commit2eb0fb2fcf89653906673ae9b7fc008165acd37d (patch)
tree4d6b3aa2b578c4c069910c843e81a537766a0aa8
parent0fa2b2c436a284e8ba9d3438e788560684dcba44 (diff)
downloadpoky-2eb0fb2fcf89653906673ae9b7fc008165acd37d.tar.gz
poky-2eb0fb2fcf89653906673ae9b7fc008165acd37d.tar.bz2
poky-2eb0fb2fcf89653906673ae9b7fc008165acd37d.zip
pypi.bbclass: mind package suffix on version check
Some pypi packages do have suffixes like dev, or a0 or b1. When doing a version check on these, the version will get falsely identified as major release versions. Add a terminating slash to rule out those false positives (From OE-Core rev: 13b145b9551884534f1dd2446eccfc55abc25f38) Signed-off-by: Konrad Weihmann <kweihmann@outlook.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> Signed-off-by: Steve Sakoman <steve@sakoman.com> (cherry picked from commit 0603f6d9f2abfa67b99b1bc39228f6aa16a0370d) [Yocto bug #13990] Signed-off-by: Armin Kuster <akuster808@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/classes/pypi.bbclass2
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/classes/pypi.bbclass b/meta/classes/pypi.bbclass
index e5d7ab3ce1..ffa8aa3ff4 100644
--- a/meta/classes/pypi.bbclass
+++ b/meta/classes/pypi.bbclass
@@ -23,4 +23,4 @@ SRC_URI += "${PYPI_SRC_URI}"
S = "${WORKDIR}/${PYPI_PACKAGE}-${PV}"
UPSTREAM_CHECK_URI ?= "https://pypi.python.org/pypi/${PYPI_PACKAGE}/"
-UPSTREAM_CHECK_REGEX ?= "/${PYPI_PACKAGE}/(?P<pver>(\d+[\.\-_]*)+)"
+UPSTREAM_CHECK_REGEX ?= "/${PYPI_PACKAGE}/(?P<pver>(\d+[\.\-_]*)+)/"