From 6f3ace8ba75eed891aa4844a6830bedca3d8b70e Mon Sep 17 00:00:00 2001 From: Emilia Ciobanu Date: Thu, 14 Feb 2013 17:52:40 +0200 Subject: Solved package namespace errors in PRS For some packages PRS reported incorrect upstream version as it was either the raw string or it mismatched some alternative groups. Signed-off-by: Emilia Ciobanu Signed-off-by: Richard Purdie --- meta/classes/distrodata.bbclass | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'meta/classes/distrodata.bbclass') diff --git a/meta/classes/distrodata.bbclass b/meta/classes/distrodata.bbclass index e25eeab367..276ca03bb6 100644 --- a/meta/classes/distrodata.bbclass +++ b/meta/classes/distrodata.bbclass @@ -291,8 +291,8 @@ python do_checkpkg() { suffix = "(tar\.gz|tgz|tar\.bz2|zip|xz|rpm|bz2|orig\.tar\.gz|tar\.xz|src\.tar\.gz|src\.tgz|svnr\d+\.tar\.bz2|stable\.tar\.gz|src\.rpm)" suffixtuple = ("tar.gz", "tgz", "zip", "tar.bz2", "tar.xz", "bz2", "orig.tar.gz", "src.tar.gz", "src.rpm", "src.tgz", "svnr\d+.tar.bz2", "stable.tar.gz", "src.rpm") - sinterstr = "(?P%s?)v?(?P%s)(source)?" % (prefix, ver_regex) - sdirstr = "(?P%s)\.?v?(?P%s)(source)?[\.\-](?P%s$)" % (prefix, ver_regex, suffix) + sinterstr = "(?P%s?)v?(?P%s)(\-source)?" % (prefix, ver_regex) + sdirstr = "(?P%s)\.?v?(?P%s)(\-source)?[\.\-](?P%s$)" % (prefix, ver_regex, suffix) def parse_inter(s): m = re.search(sinterstr, s) @@ -504,7 +504,7 @@ python do_checkpkg() { status = "ErrParseDir" else: """newver still contains a full package name string""" - status = newver[1] + status = re.sub('_', '.', newver[1]) elif not len(fhtml): status = "ErrHostNoDir" -- cgit 1.2.3-korg