mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-06-01 00:59:48 +00:00
Code Issues Projects Releases Wiki Activity

distrodata.bbclass: Fix some bugs for rpm,icu and quicky recipe when checking upstream version

Browse Source 
Fix some bugs in checkpkg function when checking upstream version

Signed-off-by: Mei Lei <lei.mei@intel.com>
This commit is contained in:
Mei Lei
2011-02-21 14:34:19 +08:00
committed by Richard Purdie
parent 489465b82b
commit 6148562de2
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta/classes/distrodata.bbclass
+7 -7
View File
@@ -1,4 +1,3 @@
require conf/distro/include/distro_tracking_fields.inc require conf/distro/include/distro_tracking_fields.inc
addhandler distro_eventhandler addhandler distro_eventhandler
@@ -263,9 +262,10 @@ python do_checkpkg() {
""" """
prefix1 = "[a-zA-Z][a-zA-Z0-9]*([\-_][a-zA-Z]\w+)*[\-_]" # match most patterns which uses "-" as separator to version digits prefix1 = "[a-zA-Z][a-zA-Z0-9]*([\-_][a-zA-Z]\w+)*[\-_]" # match most patterns which uses "-" as separator to version digits
prefix2 = "[a-zA-Z]+" # a loose pattern such as for unzip552.tar.gz prefix2 = "[a-zA-Z]+" # a loose pattern such as for unzip552.tar.gz
prefix = "(%s|%s)" % (prefix1, prefix2) prefix3 = "[0-9a-zA-Z]+" # a loose pattern such as for 80325-quicky-0.4.tar.gz
suffix = "(tar\.gz|tgz|tar\.bz2|zip|xz)" prefix = "(%s|%s|%s)" % (prefix1, prefix2, prefix3)
suffixtuple = ("tar.gz", "tgz", "zip", "tar.bz2", "tar.xz") suffix = "(tar\.gz|tgz|tar\.bz2|zip|xz|rpm)"
suffixtuple = ("tar.gz", "tgz", "zip", "tar.bz2", "tar.xz", "src.rpm")
sinterstr = "(?P<name>%s?)(?P<ver>.*)" % prefix sinterstr = "(?P<name>%s?)(?P<ver>.*)" % prefix
sdirstr = "(?P<name>%s)(?P<ver>.*)\.(?P<type>%s$)" % (prefix, suffix) sdirstr = "(?P<name>%s)(?P<ver>.*)\.(?P<type>%s$)" % (prefix, suffix)
@@ -294,9 +294,8 @@ python do_checkpkg() {
(en, ev, et) = new (en, ev, et) = new
if on != en or (et and et not in suffixtuple): if on != en or (et and et not in suffixtuple):
return 0 return 0
ov = re.search("[\d|\.]+[^a-zA-Z]+", ov).group()
ov = re.search("\d+[^a-zA-Z]+", ov).group() ev = re.search("[\d|\.]+[^a-zA-Z]+", ev).group()
ev = re.search("\d+[^a-zA-Z]+", ev).group()
return bb.utils.vercmp(("0", ov, ""), ("0", ev, "")) return bb.utils.vercmp(("0", ov, ""), ("0", ev, ""))
""" """
@@ -415,6 +414,7 @@ python do_checkpkg() {
"""match "{PN}-5.21.1.tar.gz">{PN}-5.21.1.tar.gz """ """match "{PN}-5.21.1.tar.gz">{PN}-5.21.1.tar.gz """
pn1 = re.search("^%s" % prefix, curname).group() pn1 = re.search("^%s" % prefix, curname).group()
s = "[^\"]*%s[^\d\"]*?(\d+[\.\-_])+[^\"]*" % pn1 s = "[^\"]*%s[^\d\"]*?(\d+[\.\-_])+[^\"]*" % pn1
searchstr = "[hH][rR][eE][fF]=\"%s\".*>" % s searchstr = "[hH][rR][eE][fF]=\"%s\".*>" % s
reg = re.compile(searchstr) reg = re.compile(searchstr)