update.py: show branch if missing conf/layer.conf

Currently, the error message is something like:
ERROR: conf/layer.conf not found for layer meta-doom - is subdirectory set correctly?

This is because in this case meta-doom has a 'langdale' branch without
a conf/layer.conf

Another example is:
ERROR: conf/layer.conf not found for layer meta-st-stm32mp - is subdirectory set correctly?

This is because meta-st-stm32mp has a master branch, but it only contains
a README.md telling you to use the stable branches (e.g. nanbield).

Make it more obvious what the source of the error is by also displaying
the branch that was being attempted.

Signed-off-by: Tim Orling <tim.orling@konsulko.com>
This commit is contained in:
Tim Orling 2023-11-17 11:37:00 -08:00
parent 0bcaf71deb
commit cbd9cf632e

View File

@ -426,7 +426,7 @@ def main():
continue continue
if not os.path.exists(os.path.join(layerdir, 'conf/layer.conf')): if not os.path.exists(os.path.join(layerdir, 'conf/layer.conf')):
logger.error("conf/layer.conf not found for layer %s - is subdirectory set correctly?" % layer.name) logger.error("conf/layer.conf not found for layer %s (branch %s) - is subdirectory set correctly?" % (layer.name, branch))
continue continue
cmd = prepare_update_layer_command(options, branchobj, layer, initial=True) cmd = prepare_update_layer_command(options, branchobj, layer, initial=True)