If you're diagnosing problems with the bitbake server when running the update script, then you need to be able to look at bitbake-cookerdaemon.log, but you couldn't do that after the fact because the temporary directory it gets written out to was being unconditionally deleted. Add a --keep-temp option which preserves it and some debug messages to tell you where it is.
Signed-off-by: Paul Eggleton <[email protected]> --- layerindex/update.py | 5 +++++ layerindex/update_layer.py | 10 +++++++++- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/layerindex/update.py b/layerindex/update.py index 2d578df..d1e67a0 100755 --- a/layerindex/update.py +++ b/layerindex/update.py @@ -85,6 +85,8 @@ def prepare_update_layer_command(options, branch, layer, initial=False): cmd += ' -d' elif options.loglevel == logging.ERROR: cmd += ' -q' + if options.keep_temp: + cmd += ' --keep-temp' return cmd def update_actual_branch(layerquery, fetchdir, branch, options, update_bitbake, bitbakepath): @@ -165,6 +167,9 @@ def main(): parser.add_option("-q", "--quiet", help = "Hide all output except error messages", action="store_const", const=logging.ERROR, dest="loglevel") + parser.add_option("", "--keep-temp", + help = "Preserve temporary directory at the end instead of deleting it", + action="store_true") options, args = parser.parse_args(sys.argv) if len(args) > 1: diff --git a/layerindex/update_layer.py b/layerindex/update_layer.py index 7f0c08f..d91c00e 100644 --- a/layerindex/update_layer.py +++ b/layerindex/update_layer.py @@ -194,6 +194,9 @@ def main(): parser.add_option("-q", "--quiet", help = "Hide all output except error messages", action="store_const", const=logging.ERROR, dest="loglevel") + parser.add_option("", "--keep-temp", + help = "Preserve temporary directory at the end instead of deleting it", + action="store_true") options, args = parser.parse_args(sys.argv) if len(args) > 1: @@ -258,6 +261,7 @@ def main(): except recipeparse.RecipeParseError as e: logger.error(str(e)) sys.exit(1) + logger.debug('Using temp directory %s' % tempdir) # Clear the default value of SUMMARY so that we can use DESCRIPTION instead if it hasn't been set tinfoil.config_data.setVar('SUMMARY', '') # Clear the default value of DESCRIPTION so that we can see where it's not set @@ -702,7 +706,11 @@ def main(): if LooseVersion(bb.__version__) > LooseVersion("1.27"): tinfoil.shutdown() - shutil.rmtree(tempdir) + if options.keep_temp: + logger.debug('Preserving temp directory %s' % tempdir) + else: + logger.debug('Deleting temp directory') + shutil.rmtree(tempdir) sys.exit(0) -- 2.9.5 -- _______________________________________________ yocto mailing list [email protected] https://lists.yoctoproject.org/listinfo/yocto
