* [PATCH 0/1]distrodata.bbclass: Fix some checkpkg bugs
@ 2011-02-21 6:40 Mei Lei
2011-02-21 6:40 ` [PATCH 1/1] distrodata.bbclass: Fix some bugs for rpm, icu and quicky recipe when checking upstream version Mei Lei
2011-02-21 17:54 ` [PATCH 0/1]distrodata.bbclass: Fix some checkpkg bugs Richard Purdie
0 siblings, 2 replies; 3+ messages in thread
From: Mei Lei @ 2011-02-21 6:40 UTC (permalink / raw)
To: poky
From: Mei Lei <lei.mei@intel.com>
Hi Saul,
This commit fix some bugs in checkpkg function when checking upstream version.
Thanks
Lei
Pull URL: git://git.pokylinux.org/poky-contrib.git
Branch: lmei3/distrodata.bbclass
Browse: http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=lmei3/distrodata.bbclass
Thanks,
Mei Lei <lei.mei@intel.com>
---
Mei Lei (1):
distrodata.bbclass: Fix some bugs for rpm,icu and quicky recipe when
checking upstream version
meta/classes/distrodata.bbclass | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
^ permalink raw reply [flat|nested] 3+ messages in thread
* [PATCH 1/1] distrodata.bbclass: Fix some bugs for rpm, icu and quicky recipe when checking upstream version
2011-02-21 6:40 [PATCH 0/1]distrodata.bbclass: Fix some checkpkg bugs Mei Lei
@ 2011-02-21 6:40 ` Mei Lei
2011-02-21 17:54 ` [PATCH 0/1]distrodata.bbclass: Fix some checkpkg bugs Richard Purdie
1 sibling, 0 replies; 3+ messages in thread
From: Mei Lei @ 2011-02-21 6:40 UTC (permalink / raw)
To: poky
From: Mei Lei <lei.mei@intel.com>
Fix some bugs in checkpkg function when checking upstream version
Signed-off-by: Mei Lei <lei.mei@intel.com>
---
meta/classes/distrodata.bbclass | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/meta/classes/distrodata.bbclass b/meta/classes/distrodata.bbclass
index 31e7420..049ebf9 100644
--- a/meta/classes/distrodata.bbclass
+++ b/meta/classes/distrodata.bbclass
@@ -1,4 +1,3 @@
-
require conf/distro/include/distro_tracking_fields.inc
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
prefix2 = "[a-zA-Z]+" # a loose pattern such as for unzip552.tar.gz
- prefix = "(%s|%s)" % (prefix1, prefix2)
- suffix = "(tar\.gz|tgz|tar\.bz2|zip|xz)"
- suffixtuple = ("tar.gz", "tgz", "zip", "tar.bz2", "tar.xz")
+ prefix3 = "[0-9a-zA-Z]+" # a loose pattern such as for 80325-quicky-0.4.tar.gz
+ prefix = "(%s|%s|%s)" % (prefix1, prefix2, prefix3)
+ 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
sdirstr = "(?P<name>%s)(?P<ver>.*)\.(?P<type>%s$)" % (prefix, suffix)
@@ -294,9 +294,8 @@ python do_checkpkg() {
(en, ev, et) = new
if on != en or (et and et not in suffixtuple):
return 0
-
- ov = re.search("\d+[^a-zA-Z]+", ov).group()
- ev = re.search("\d+[^a-zA-Z]+", ev).group()
+ ov = re.search("[\d|\.]+[^a-zA-Z]+", ov).group()
+ ev = re.search("[\d|\.]+[^a-zA-Z]+", ev).group()
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 """
pn1 = re.search("^%s" % prefix, curname).group()
+
s = "[^\"]*%s[^\d\"]*?(\d+[\.\-_])+[^\"]*" % pn1
searchstr = "[hH][rR][eE][fF]=\"%s\".*>" % s
reg = re.compile(searchstr)
--
1.6.3.3
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH 0/1]distrodata.bbclass: Fix some checkpkg bugs
2011-02-21 6:40 [PATCH 0/1]distrodata.bbclass: Fix some checkpkg bugs Mei Lei
2011-02-21 6:40 ` [PATCH 1/1] distrodata.bbclass: Fix some bugs for rpm, icu and quicky recipe when checking upstream version Mei Lei
@ 2011-02-21 17:54 ` Richard Purdie
1 sibling, 0 replies; 3+ messages in thread
From: Richard Purdie @ 2011-02-21 17:54 UTC (permalink / raw)
To: Mei Lei; +Cc: poky
On Fri, 2011-01-21 at 14:39 +0800, Mei Lei wrote:
> From: Mei Lei <lei.mei@intel.com>
>
> Hi Saul,
> This commit fix some bugs in checkpkg function when checking upstream version.
>
> Thanks
> Lei
>
> Pull URL: git://git.pokylinux.org/poky-contrib.git
> Branch: lmei3/distrodata.bbclass
> Browse: http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=lmei3/distrodata.bbclass
>
> Thanks,
> Mei Lei <lei.mei@intel.com>
> ---
>
>
> Mei Lei (1):
> distrodata.bbclass: Fix some bugs for rpm,icu and quicky recipe when
> checking upstream version
>
> meta/classes/distrodata.bbclass | 14 +++++++-------
> 1 files changed, 7 insertions(+), 7 deletions(-)
Merged to master, thanks.
Richard
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2011-02-21 17:55 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-02-21 6:40 [PATCH 0/1]distrodata.bbclass: Fix some checkpkg bugs Mei Lei
2011-02-21 6:40 ` [PATCH 1/1] distrodata.bbclass: Fix some bugs for rpm, icu and quicky recipe when checking upstream version Mei Lei
2011-02-21 17:54 ` [PATCH 0/1]distrodata.bbclass: Fix some checkpkg bugs Richard Purdie
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox