diff options
| author |   Emilia Ciobanu <emilia.maria.silvia.ciobanu@intel.com> | 2013-02-14 17:52:40 +0200 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-02-14 23:14:42 +0000 |
| commit | 6f3ace8ba75eed891aa4844a6830bedca3d8b70e (patch) | |
| tree | 7f475ca2d0a75ba668ced6ac43f1fcbd946dad15 | |
| parent | 1165a0b161ffc32258b0726e6ef3082d97dfb32a (diff) | |
| download | openembedded-core-contrib-6f3ace8ba75eed891aa4844a6830bedca3d8b70e.tar.gz | |
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 <emilia.maria.silvia.ciobanu@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/classes/distrodata.bbclass | 6 |
1 files changed, 3 insertions, 3 deletions
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<name>%s?)v?(?P<ver>%s)(source)?" % (prefix, ver_regex) - sdirstr = "(?P<name>%s)\.?v?(?P<ver>%s)(source)?[\.\-](?P<type>%s$)" % (prefix, ver_regex, suffix) + sinterstr = "(?P<name>%s?)v?(?P<ver>%s)(\-source)?" % (prefix, ver_regex) + sdirstr = "(?P<name>%s)\.?v?(?P<ver>%s)(\-source)?[\.\-](?P<type>%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" |