The new client/server API of tinfoil requires explicit call of shutdown method to send the event for finalize cooker process.
Also in update_layer remove the databuilder and cache instance now isn't needed. Signed-off-by: Aníbal Limón <anibal.li...@linux.intel.com> --- layerindex/bulkchange.py | 1 + layerindex/recipedesc.py | 2 ++ layerindex/recipeparse.py | 6 ------ layerindex/tools/import_classic.py | 1 + layerindex/update_layer.py | 1 + 5 files changed, 5 insertions(+), 6 deletions(-) diff --git a/layerindex/bulkchange.py b/layerindex/bulkchange.py index 8102571..e32fae6 100644 --- a/layerindex/bulkchange.py +++ b/layerindex/bulkchange.py @@ -231,6 +231,7 @@ def main(): outp = generate_patches(tinfoil, fetchdir, changeset, sys.argv[2]) finally: + tinfoil.shutdown() utils.unlock_file(lockfile) if outp: diff --git a/layerindex/recipedesc.py b/layerindex/recipedesc.py index 43376cf..989988a 100644 --- a/layerindex/recipedesc.py +++ b/layerindex/recipedesc.py @@ -89,6 +89,8 @@ def main(): except Exception as e: logger.info("Unable to read %s: %s", fullpath, str(e)) + tinfoil.shutdown() + sys.exit(0) diff --git a/layerindex/recipeparse.py b/layerindex/recipeparse.py index 26c61aa..9cfd65c 100644 --- a/layerindex/recipeparse.py +++ b/layerindex/recipeparse.py @@ -34,12 +34,6 @@ def _setup_tinfoil(bitbakepath, enable_tracking): tinfoil.cooker.enableDataTracking() tinfoil.prepare(config_only = True) - # XXX: Setup databuilder - tinfoil.databuilder = bb.cookerdata.CookerDataBuilder(tinfoil.config) - tinfoil.databuilder.parseBaseConfiguration() - - tinfoil.cache = bb.cache.NoCache(tinfoil.databuilder) - return tinfoil def _parse_layer_conf(layerdir, data): diff --git a/layerindex/tools/import_classic.py b/layerindex/tools/import_classic.py index 45ccaa9..085401c 100755 --- a/layerindex/tools/import_classic.py +++ b/layerindex/tools/import_classic.py @@ -201,6 +201,7 @@ def main(): transaction.rollback() finally: transaction.leave_transaction_management() + tinfoil.shutdown() shutil.rmtree(tempdir) sys.exit(0) diff --git a/layerindex/update_layer.py b/layerindex/update_layer.py index 13b508f..58050f9 100644 --- a/layerindex/update_layer.py +++ b/layerindex/update_layer.py @@ -611,6 +611,7 @@ def main(): import traceback traceback.print_exc() + tinfoil.shutdown() shutil.rmtree(tempdir) sys.exit(0) -- 2.1.4 -- _______________________________________________ yocto mailing list yocto@yoctoproject.org https://lists.yoctoproject.org/listinfo/yocto