mirror of
https://git.yoctoproject.org/poky
synced 2026-02-15 05:03:03 +01:00
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>
This commit is contained in:
committed by
Richard Purdie
parent
5dab6274b1
commit
444b6e1cd8
@@ -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"
|
||||
|
||||
|
||||
Reference in New Issue
Block a user