summaryrefslogtreecommitdiffstats
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)
downloadpoky-adbaae2179a6c3746e53f7fbb2ca0939e85a7ea9.tar.gz
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() {
368 for line in fhtml.split("\n"): 368 for line in fhtml.split("\n"):
369 if line.find(curver) >= 0: 369 if line.find(curver) >= 0:
370 valid = 1 370 valid = 1
371
372 m = reg.search(line) 371 m = reg.search(line)
373 if m: 372 if m:
374 ver = m.group().split("\"")[1] 373 ver = m.group().split("\"")[1]
@@ -416,7 +415,7 @@ python do_checkpkg() {
416 pn1 = re.search("^%s" % prefix, curname).group() 415 pn1 = re.search("^%s" % prefix, curname).group()
417 416
418 s = "[^\"]*%s[^\d\"]*?(\d+[\.\-_])+[^\"]*" % pn1 417 s = "[^\"]*%s[^\d\"]*?(\d+[\.\-_])+[^\"]*" % pn1
419 searchstr = "[hH][rR][eE][fF]=\"%s\".*>" % s 418 searchstr = "[hH][rR][eE][fF]=\"%s\".*[>\"]" % s
420 reg = re.compile(searchstr) 419 reg = re.compile(searchstr)
421 420
422 valid = 0 421 valid = 0
@@ -425,6 +424,8 @@ python do_checkpkg() {
425 if m: 424 if m:
426 valid = 1 425 valid = 1
427 ver = m.group().split("\"")[1].split("/")[-1] 426 ver = m.group().split("\"")[1].split("/")[-1]
427 if ver == "download":
428 ver = m.group().split("\"")[1].split("/")[-2]
428 ver = parse_dir(ver) 429 ver = parse_dir(ver)
429 if ver and __vercmp(newver, ver) < 0: 430 if ver and __vercmp(newver, ver) < 0:
430 newver = ver 431 newver = ver
@@ -434,7 +435,7 @@ python do_checkpkg() {
434 status = "ErrParseDir" 435 status = "ErrParseDir"
435 else: 436 else:
436 """newver still contains a full package name string""" 437 """newver still contains a full package name string"""
437 status = re.search("(\d+[.\-_])*[0-9a-zA-Z]+", newver[1]).group() 438 status = re.search("(\d+[\.\-_])*(\d+[0-9a-zA-Z]*)", newver[1]).group()
438 elif not len(fhtml): 439 elif not len(fhtml):
439 status = "ErrHostNoDir" 440 status = "ErrHostNoDir"
440 441