[bitbake-devel] [PATCH 1/2] toaster: do not fail on optional 'custom.xml' file

[Reyna, David]

-----Original Message-----
From: bitbake-devel-bounces at lists.openembedded.org [mailto:bitbake-devel-bounces at lists.openembedded.org] On Behalf Of David Reyna
Sent: Thursday, February 15, 2018 8:26 PM
To: bitbake-devel at lists.openembedded.org
Subject: [bitbake-devel] [PATCH 1/2] toaster: do not fail on optional 'custom.xml' file

From: David Reyna <David.Reyna at windriver.com>

Explicitly capture and ignore errors when trying to load the optional
'custom.xml' fixture file.

[YOCTO #12554]

Signed-off-by: David Reyna <David.Reyna at windriver.com>
---
 lib/toaster/bldcontrol/management/commands/checksettings.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

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, "
-- 
2.7.4

-- 
_______________________________________________
bitbake-devel mailing list
bitbake-devel at lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/bitbake-devel