MIRRORS/layerindex-web
1
0
Fork 0
mirror of git://git.yoctoproject.org/layerindex-web.git synced 2025-07-19 20:59:01 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

rrs_upstream_history: fix get_recipe_pv_without_srcpv

Browse Source 
The get_recipe_pv_without_srcpv function was renamed to
get_recipe_pv_with_pfx_sfx in:

84794b59 lib/oe/recipeutils.py: accommodate SRCPV being optional and deprecated in version check regex

Try to import/call the old method and fail over to the new method.

Signed-off-by: Tim Orling <tim.orling@konsulko.com>
This commit is contained in:
Tim Orling 2024-01-09 11:39:01 -08:00
parent eeefc7c341
commit 288b2eeba4
1 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
rrs/tools/rrs_upstream_history.py
View File

@ -87,8 +87,11 @@ def set_regexes(d):
def get_upstream_info(layerbranch, recipe_data, result): def get_upstream_info(layerbranch, recipe_data, result):
from bb.utils import vercmp_string from bb.utils import vercmp_string
from oe.recipeutils import get_recipe_upstream_version, \ from oe.recipeutils import get_recipe_upstream_version
get_recipe_pv_without_srcpv try:
from oe.recipeutils import get_recipe_pv_without_srcpv
except ImportError:
from oe.recipeutils import get_recipe_pv_with_pfx_sfx
pn = recipe_data.getVar('PN', True) pn = recipe_data.getVar('PN', True)
@ -109,10 +112,16 @@ def get_upstream_info(layerbranch, recipe_data, result):
ru.type = ru_info['type'] ru.type = ru_info['type']
ru.date = ru_info['datetime'] ru.date = ru_info['datetime']
pv, _, _ = get_recipe_pv_without_srcpv(recipe_pv, try:
get_pv_type(recipe_pv)) pv, _, _ = get_recipe_pv_without_srcpv(recipe_pv,
upv, _, _ = get_recipe_pv_without_srcpv(ru_info['version'], get_pv_type(recipe_pv))
get_pv_type(ru_info['version'])) upv, _, _ = get_recipe_pv_without_srcpv(ru_info['version'],
get_pv_type(ru_info['version']))
except NameError:
pv, _, _ = get_recipe_pv_with_pfx_sfx(recipe_pv,
get_pv_type(recipe_pv))
upv, _, _ = get_recipe_pv_with_pfx_sfx(ru_info['version'],
get_pv_type(ru_info['version']))
if pv and upv: if pv and upv:
cmp_ver = vercmp_string(pv, upv) cmp_ver = vercmp_string(pv, upv)