[PATCH 0/1]distrodata.bbclass: Change the regular expression

[PATCH 0/1]distrodata.bbclass: Change the regular expression

[Mei Lei]

From: Mei Lei <lei.mei@intel.com>

This patch fix the postfix issue.
It will drop the postfix like "origin" or "pre1" in "3.2.2.origin"[recipe:apmd] and "3.12-pre1"[recipe:module-init-tools], but keep "rc1" or "dsf" in "1.2rc1"[recipe:speex] and "2.88dsf"[recipe:sysvinit] etc. This patch resolved 22 recipes' upstream version check issue.

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 the postfix issue in check_new_ver function

 meta/classes/distrodata.bbclass |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

[PATCH 1/1] distrodata.bbclass: Fix the postfix issue in check_new_ver function

[Mei Lei]

From: Mei Lei <lei.mei@intel.com>

Change the regular expression when checking upstream version, ignore postfix like "origin" in 3.2.2.orgin, "pre1" in 3.12-pre1, but keep the postfix lik
e"rc1" in 1.2rc1.

Signed-off-by: Mei Lei <lei.mei@intel.com>
---
 meta/classes/distrodata.bbclass |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/meta/classes/distrodata.bbclass b/meta/classes/distrodata.bbclass
index 049ebf9..831c7a2 100644
--- a/meta/classes/distrodata.bbclass
+++ b/meta/classes/distrodata.bbclass
@@ -434,7 +434,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