From 9c3da34ec6c2c9a9abc30c72d6a8f9b996250862 Mon Sep 17 00:00:00 2001 From: David Reyna Date: Mon, 28 May 2018 20:26:57 -0700 Subject: bitbake: toaster: do not fail on optional 'custom.xml' file Explicitly capture and ignore errors when trying to load the optional 'custom.xml' fixture file. [YOCTO #12554] (Bitbake rev: 5b26fc8e332daaed092cdbafea3f0b8e11e5e7ae) Signed-off-by: David Reyna Signed-off-by: Richard Purdie --- bitbake/lib/toaster/bldcontrol/management/commands/checksettings.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'bitbake') diff --git a/bitbake/lib/toaster/bldcontrol/management/commands/checksettings.py b/bitbake/lib/toaster/bldcontrol/management/commands/checksettings.py index 582114ac97..823c6f154a 100644 --- a/bitbake/lib/toaster/bldcontrol/management/commands/checksettings.py +++ b/bitbake/lib/toaster/bldcontrol/management/commands/checksettings.py @@ -107,7 +107,10 @@ class Command(BaseCommand): action="ignore", message="^.*No fixture named.*$") print("Importing custom settings if present") - call_command("loaddata", "custom") + try: + call_command("loaddata", "custom") + except: + print("NOTE: optional fixture 'custom' not found") # we run lsupdates after config update print("\nFetching information from the layer index, " -- cgit v1.2.3-54-g00ecf