mirror of
git://git.yoctoproject.org/layerindex-web.git
synced 2025-07-19 20:59:01 +02:00
update: fix error on LAYERRECOMMENDS failure
The code in recipeparse.setup_layer() was trying to log a warning in the case where LAYERRECOMMENDS not being satisfied, however there is no actual logger object in this context. Pass it in via a parameter and update all callers to pass it. Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
This commit is contained in:
parent
2554449baa
commit
d328e392d2
|
@ -35,7 +35,7 @@ def generate_patches(tinfoil, fetchdir, changeset, outputdir):
|
||||||
layerfetchdir = os.path.join(fetchdir, layer.get_fetch_dir())
|
layerfetchdir = os.path.join(fetchdir, layer.get_fetch_dir())
|
||||||
utils.checkout_layer_branch(layerbranch, layerfetchdir)
|
utils.checkout_layer_branch(layerbranch, layerfetchdir)
|
||||||
layerdir = os.path.join(layerfetchdir, layerbranch.vcs_subdir)
|
layerdir = os.path.join(layerfetchdir, layerbranch.vcs_subdir)
|
||||||
config_data_copy = recipeparse.setup_layer(tinfoil.config_data, fetchdir, layerdir, layer, layerbranch)
|
config_data_copy = recipeparse.setup_layer(tinfoil.config_data, fetchdir, layerdir, layer, layerbranch, logger)
|
||||||
if outfile:
|
if outfile:
|
||||||
outfile.close()
|
outfile.close()
|
||||||
outfile = open(os.path.join(tmpoutdir, patchname), 'w')
|
outfile = open(os.path.join(tmpoutdir, patchname), 'w')
|
||||||
|
|
|
@ -94,7 +94,7 @@ def init_parser(settings, branch, bitbakepath, enable_tracking=False, nocheckout
|
||||||
|
|
||||||
return (tinfoil, tempdir)
|
return (tinfoil, tempdir)
|
||||||
|
|
||||||
def setup_layer(config_data, fetchdir, layerdir, layer, layerbranch):
|
def setup_layer(config_data, fetchdir, layerdir, layer, layerbranch, logger):
|
||||||
# Parse layer.conf files for this layer and its dependencies
|
# Parse layer.conf files for this layer and its dependencies
|
||||||
# This is necessary not just because BBPATH needs to be set in order
|
# This is necessary not just because BBPATH needs to be set in order
|
||||||
# for include/require/inherit to work outside of the current directory
|
# for include/require/inherit to work outside of the current directory
|
||||||
|
|
|
@ -168,7 +168,7 @@ def main():
|
||||||
layerclasses = BBClass.objects.filter(layerbranch=layerbranch)
|
layerclasses = BBClass.objects.filter(layerbranch=layerbranch)
|
||||||
|
|
||||||
try:
|
try:
|
||||||
config_data_copy = recipeparse.setup_layer(tinfoil.config_data, fetchdir, oeclassicpath, layer, layerbranch)
|
config_data_copy = recipeparse.setup_layer(tinfoil.config_data, fetchdir, oeclassicpath, layer, layerbranch, logger)
|
||||||
except recipeparse.RecipeParseError as e:
|
except recipeparse.RecipeParseError as e:
|
||||||
logger.error(str(e))
|
logger.error(str(e))
|
||||||
sys.exit(1)
|
sys.exit(1)
|
||||||
|
|
|
@ -469,7 +469,7 @@ def main():
|
||||||
layerbranch.save()
|
layerbranch.save()
|
||||||
|
|
||||||
try:
|
try:
|
||||||
config_data_copy = recipeparse.setup_layer(tinfoil.config_data, fetchdir, layerdir, layer, layerbranch)
|
config_data_copy = recipeparse.setup_layer(tinfoil.config_data, fetchdir, layerdir, layer, layerbranch, logger)
|
||||||
except recipeparse.RecipeParseError as e:
|
except recipeparse.RecipeParseError as e:
|
||||||
logger.error(str(e))
|
logger.error(str(e))
|
||||||
sys.exit(1)
|
sys.exit(1)
|
||||||
|
|
|
@ -101,7 +101,7 @@ def load_recipes(layerbranch, bitbakepath, fetchdir, settings, logger,
|
||||||
layerdir = os.path.join(repodir, str(layerbranch.vcs_subdir))
|
layerdir = os.path.join(repodir, str(layerbranch.vcs_subdir))
|
||||||
|
|
||||||
d = recipeparse.setup_layer(tinfoil.config_data, fetchdir, layerdir,
|
d = recipeparse.setup_layer(tinfoil.config_data, fetchdir, layerdir,
|
||||||
layer, layerbranch)
|
layer, layerbranch, logger)
|
||||||
|
|
||||||
if recipe_files is None:
|
if recipe_files is None:
|
||||||
recipe_files = get_recipe_files(layerdir)
|
recipe_files = get_recipe_files(layerdir)
|
||||||
|
|
Loading…
Reference in New Issue
Block a user