summaryrefslogtreecommitdiffstats
path: root/bitbake
diff options
context:
space:
mode:
authorDavid Reyna <David.Reyna@windriver.com>2018-05-28 20:26:57 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-05-29 11:41:57 +0100
commit9c3da34ec6c2c9a9abc30c72d6a8f9b996250862 (patch)
tree858c812fe103af4cfc9c1f123fd0e20e429dd9ac /bitbake
parent4c93959c55dcdb48032129b53e0ea75ddd7b1ee6 (diff)
downloadpoky-9c3da34ec6c2c9a9abc30c72d6a8f9b996250862.tar.gz
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 <David.Reyna@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake')
-rw-r--r--bitbake/lib/toaster/bldcontrol/management/commands/checksettings.py5
1 files changed, 4 insertions, 1 deletions
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):
107 action="ignore", 107 action="ignore",
108 message="^.*No fixture named.*$") 108 message="^.*No fixture named.*$")
109 print("Importing custom settings if present") 109 print("Importing custom settings if present")
110 call_command("loaddata", "custom") 110 try:
111 call_command("loaddata", "custom")
112 except:
113 print("NOTE: optional fixture 'custom' not found")
111 114
112 # we run lsupdates after config update 115 # we run lsupdates after config update
113 print("\nFetching information from the layer index, " 116 print("\nFetching information from the layer index, "