From patchwork Thu Feb 14 15:52:40 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [1/2] Solved package namespace errors in PRS Date: Thu, 14 Feb 2013 15:52:40 -0000 From: Emilia Ciobanu X-Patchwork-Id: 44643 Message-Id: <1360857160-17509-1-git-send-email-emilia.maria.silvia.ciobanu@intel.com> To: openembedded-core@lists.openembedded.org 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 --- meta/classes/distrodata.bbclass | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/meta/classes/distrodata.bbclass b/meta/classes/distrodata.bbclass index e25eeab..276ca03 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"