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

update: fix commands.getstatusoutput errors when parsing python2 branch

Browse Source 
If you update a python2-based branch then the python2-compatible version
of bitbake will be checked out, but we are calling into bitbake's
bb.utils directly here from python 3 and thus you get an error about
commands.getstatusoutput being missing (since that is not available in
python 3 and the old version of bitbake refers to it). To fix this,
check out origin/master in the bitbake repo right before we call the
code in question.

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
This commit is contained in:
Paul Eggleton 2018-10-01 16:16:12 +13:00
parent 5568ba0ebf
commit 11a1d0859d
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
layerindex/update.py
View File

@ -436,6 +436,12 @@ def main():
deps = extract_value('LAYERDEPENDS', output) deps = extract_value('LAYERDEPENDS', output)
recs = extract_value('LAYERRECOMMENDS', output) recs = extract_value('LAYERRECOMMENDS', output)
if not options.nocheckout:
# We need to check this out because we're using stuff from bb.utils
# below, and if we don't it might be a python 2 revision which would
# be an issue
utils.checkout_repo(bitbakepath, 'origin/master', logger=logger)
deps_dict = utils.explode_dep_versions2(bitbakepath, deps) deps_dict = utils.explode_dep_versions2(bitbakepath, deps)
recs_dict = utils.explode_dep_versions2(bitbakepath, recs) recs_dict = utils.explode_dep_versions2(bitbakepath, recs)
if not (deps_dict or recs_dict): if not (deps_dict or recs_dict):