* [PATCH 0/1]distrodata.bbclass: Fix some issues when checking upstream version on sourceforge
@ 2011-02-23 11:53 Mei Lei
2011-02-23 11:53 ` [PATCH 1/1] distrodata.bbclass: " Mei Lei
2011-02-23 16:23 ` [PATCH 0/1]distrodata.bbclass: " Richard Purdie
0 siblings, 2 replies; 3+ messages in thread
From: Mei Lei @ 2011-02-23 11:53 UTC (permalink / raw)
To: poky
From: Mei Lei <lei.mei@intel.com>
After this patch, it will check more 34 recipes upsteam version automatically, so we only need to check about 20 recipes upstream version manually.
I will continue to reduce the manual check number.
Pull URL: git://git.pokylinux.org/poky-contrib.git
Branch: lmei3/distrodata2
Browse: http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=lmei3/distrodata2
Thanks,
Mei Lei <lei.mei@intel.com>
---
Mei Lei (1):
distrodata.bbclass: Fix some issues when checking upstream version on
sourceforge
meta/classes/distrodata.bbclass | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
^ permalink raw reply [flat|nested] 3+ messages in thread
* [PATCH 1/1] distrodata.bbclass: Fix some issues when checking upstream version on sourceforge
2011-02-23 11:53 [PATCH 0/1]distrodata.bbclass: Fix some issues when checking upstream version on sourceforge Mei Lei
@ 2011-02-23 11:53 ` Mei Lei
2011-02-23 16:23 ` [PATCH 0/1]distrodata.bbclass: " Richard Purdie
1 sibling, 0 replies; 3+ messages in thread
From: Mei Lei @ 2011-02-23 11:53 UTC (permalink / raw)
To: poky
From: Mei Lei <lei.mei@intel.com>
Signed-off-by: Mei Lei <lei.mei@intel.com>
---
meta/classes/distrodata.bbclass | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/meta/classes/distrodata.bbclass b/meta/classes/distrodata.bbclass
index 049ebf9..d84b306 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"
--
1.6.3.3
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH 0/1]distrodata.bbclass: Fix some issues when checking upstream version on sourceforge
2011-02-23 11:53 [PATCH 0/1]distrodata.bbclass: Fix some issues when checking upstream version on sourceforge Mei Lei
2011-02-23 11:53 ` [PATCH 1/1] distrodata.bbclass: " Mei Lei
@ 2011-02-23 16:23 ` Richard Purdie
1 sibling, 0 replies; 3+ messages in thread
From: Richard Purdie @ 2011-02-23 16:23 UTC (permalink / raw)
To: Mei Lei; +Cc: poky
On Sun, 2011-01-23 at 19:52 +0800, Mei Lei wrote:
> From: Mei Lei <lei.mei@intel.com>
>
> After this patch, it will check more 34 recipes upsteam version automatically, so we only need to check about 20 recipes upstream version manually.
> I will continue to reduce the manual check number.
>
> Pull URL: git://git.pokylinux.org/poky-contrib.git
> Branch: lmei3/distrodata2
> Browse: http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=lmei3/distrodata2
>
> Thanks,
> Mei Lei <lei.mei@intel.com>
> ---
>
>
> Mei Lei (1):
> distrodata.bbclass: Fix some issues when checking upstream version on
> sourceforge
>
> meta/classes/distrodata.bbclass | 7 ++++---
> 1 files changed, 4 insertions(+), 3 deletions(-)
Merged to master, thanks.
Cheers,
Richard
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2011-02-23 16:23 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-02-23 11:53 [PATCH 0/1]distrodata.bbclass: Fix some issues when checking upstream version on sourceforge Mei Lei
2011-02-23 11:53 ` [PATCH 1/1] distrodata.bbclass: " Mei Lei
2011-02-23 16:23 ` [PATCH 0/1]distrodata.bbclass: " Richard Purdie
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.