summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEmilia Ciobanu <emilia.maria.silvia.ciobanu@intel.com>2013-02-14 15:52:40 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-02-14 23:14:47 (GMT)
commit444b6e1cd8f49e010560dfdb5d17c4eef03ffe9e (patch)
treec57956dde1f0e28987196a2253979e77b7f7d097
parent5dab6274b1b0cb32071781bd4fb815852135b815 (diff)
downloadpoky-444b6e1cd8f49e010560dfdb5d17c4eef03ffe9e.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. (From OE-Core rev: 6f3ace8ba75eed891aa4844a6830bedca3d8b70e) 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.bbclass6
1 files 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() {
291 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)" 291 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)"
292 292
293 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") 293 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")
294 sinterstr = "(?P<name>%s?)v?(?P<ver>%s)(source)?" % (prefix, ver_regex) 294 sinterstr = "(?P<name>%s?)v?(?P<ver>%s)(\-source)?" % (prefix, ver_regex)
295 sdirstr = "(?P<name>%s)\.?v?(?P<ver>%s)(source)?[\.\-](?P<type>%s$)" % (prefix, ver_regex, suffix) 295 sdirstr = "(?P<name>%s)\.?v?(?P<ver>%s)(\-source)?[\.\-](?P<type>%s$)" % (prefix, ver_regex, suffix)
296 296
297 def parse_inter(s): 297 def parse_inter(s):
298 m = re.search(sinterstr, s) 298 m = re.search(sinterstr, s)
@@ -504,7 +504,7 @@ python do_checkpkg() {
504 status = "ErrParseDir" 504 status = "ErrParseDir"
505 else: 505 else:
506 """newver still contains a full package name string""" 506 """newver still contains a full package name string"""
507 status = newver[1] 507 status = re.sub('_', '.', newver[1])
508 elif not len(fhtml): 508 elif not len(fhtml):
509 status = "ErrHostNoDir" 509 status = "ErrHostNoDir"
510 510