diff options
author | David Reyna <David.Reyna@windriver.com> | 2018-02-15 20:26:01 -0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-03-28 12:52:30 +0100 |
commit | 132458939d3987ebc58685397714af3d6d5cd8fd (patch) | |
tree | 66ba6aff4956936dbc3797bfe38fca0fe2870ca6 | |
parent | 8212446de11c0e370c55f88cde86334b760cd939 (diff) | |
download | bitbake-contrib-132458939d3987ebc58685397714af3d6d5cd8fd.tar.gz |
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]
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.py | 5 |
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 582114ac9..823c6f154 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, " |