summaryrefslogtreecommitdiff
path: root/meta/classes
diff options
context:
space:
mode:
authorMei Lei <lei.mei@intel.com>2011-02-23 19:35:04 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-02-23 16:23:32 +0000
commitadbaae2179a6c3746e53f7fbb2ca0939e85a7ea9 (patch)
treeeff2f13d965d0ccae7ebaf584fbf72961d76ad49 /meta/classes
parent6abfee773fa9696fc7556da0bf78cd153080cb3d (diff)
downloadopenembedded-core-adbaae2179a6c3746e53f7fbb2ca0939e85a7ea9.tar.gz
openembedded-core-adbaae2179a6c3746e53f7fbb2ca0939e85a7ea9.tar.bz2
openembedded-core-adbaae2179a6c3746e53f7fbb2ca0939e85a7ea9.zip
distrodata.bbclass: Fix some issues when checking upstream version on sourceforge
Signed-off-by: Mei Lei <lei.mei@intel.com>
Diffstat (limited to 'meta/classes')
-rw-r--r--meta/classes/distrodata.bbclass7
1 files changed, 4 insertions, 3 deletions
diff --git a/meta/classes/distrodata.bbclass b/meta/classes/distrodata.bbclass
index 049ebf93a0..d84b306226 100644
--- a/meta/classes/distrodata.bbclass
+++ b/meta/classes/distrodata.bbclass
@@ -368,7 +368,6 @@ python do_checkpkg() {
for line in fhtml.split("\n"):
if line.find(curver) >= 0:
valid = 1
-
m = reg.search(line)
if m:
ver = m.group().split("\"")[1]
@@ -416,7 +415,7 @@ python do_checkpkg() {
pn1 = re.search("^%s" % prefix, curname).group()
s = "[^\"]*%s[^\d\"]*?(\d+[\.\-_])+[^\"]*" % pn1
- searchstr = "[hH][rR][eE][fF]=\"%s\".*>" % s
+ searchstr = "[hH][rR][eE][fF]=\"%s\".*[>\"]" % s
reg = re.compile(searchstr)
valid = 0
@@ -425,6 +424,8 @@ python do_checkpkg() {
if m:
valid = 1
ver = m.group().split("\"")[1].split("/")[-1]
+ if ver == "download":
+ ver = m.group().split("\"")[1].split("/")[-2]
ver = parse_dir(ver)
if ver and __vercmp(newver, ver) < 0:
newver = ver
@@ -434,7 +435,7 @@ python do_checkpkg() {
status = "ErrParseDir"
else:
"""newver still contains a full package name string"""
- status = re.search("(\d+[.\-_])*[0-9a-zA-Z]+", newver[1]).group()
+ status = re.search("(\d+[\.\-_])*(\d+[0-9a-zA-Z]*)", newver[1]).group()
elif not len(fhtml):
status = "ErrHostNoDir"