From 7e467585aefc3765340edec2e2cc3da96a8df4de Mon Sep 17 00:00:00 2001 From: Paul Eggleton Date: Thu, 19 Apr 2018 16:46:00 +1200 Subject: bulkchange.py: fix regression It seems that in df492b127723973e5e2c18c74b1fee853d41bc69 the original intention was to move setup_layer to the utils module, but that didn't actually get done in the final patch - however the change was made here to accommodate the move, meaning it's been broken since then. Revert that so we're actually calling the function in the place it exists. Signed-off-by: Paul Eggleton --- layerindex/bulkchange.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'layerindex/bulkchange.py') diff --git a/layerindex/bulkchange.py b/layerindex/bulkchange.py index 2d8a7dfdf1..316c7112ae 100644 --- a/layerindex/bulkchange.py +++ b/layerindex/bulkchange.py @@ -44,7 +44,7 @@ def generate_patches(tinfoil, fetchdir, changeset, outputdir): layerfetchdir = os.path.join(fetchdir, layer.get_fetch_dir()) utils.checkout_layer_branch(layerbranch, layerfetchdir) layerdir = os.path.join(layerfetchdir, layerbranch.vcs_subdir) - config_data_copy = utils.setup_layer(tinfoil.config_data, fetchdir, layerdir, layer, layerbranch) + config_data_copy = recipeparse.setup_layer(tinfoil.config_data, fetchdir, layerdir, layer, layerbranch) if outfile: outfile.close() outfile = open(os.path.join(tmpoutdir, patchname), 'w') -- cgit 1.2.3-korg