aboutsummaryrefslogtreecommitdiff
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:38 +0100
commit5b26fc8e332daaed092cdbafea3f0b8e11e5e7ae (patch)
treed3eb395d873da6d02dc2e148bf4a4f248fa0cd3f
parent14079cb1fd497799548c677962d89c02a6d2bf92 (diff)
downloadbitbake-1.36.zip
bitbake-1.36.tar.gz
bitbake-1.36.tar.bz2
toaster: do not fail on optional 'custom.xml' file1.36
Explicitly capture and ignore errors when trying to load the optional 'custom.xml' fixture file. [YOCTO #12554] Signed-off-by: David Reyna <David.Reyna@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--lib/toaster/bldcontrol/management/commands/checksettings.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/lib/toaster/bldcontrol/management/commands/checksettings.py b/lib/toaster/bldcontrol/management/commands/checksettings.py
index 582114a..823c6f1 100644
--- a/lib/toaster/bldcontrol/management/commands/checksettings.py
+++ b/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, "