[oe-commits] [bitbake] 02/02: toaster: do not fail on optional 'custom.xml' file

[git at git.openembedded.org]

This is an automated email from the git hooks/post-receive script.

rpurdie pushed a commit to branch 1.36
in repository bitbake.

commit 5b26fc8e332daaed092cdbafea3f0b8e11e5e7ae
Author: David Reyna <David.Reyna at windriver.com>
AuthorDate: Mon May 28 20:26:57 2018 -0700

    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 at windriver.com>
    Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
 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, "

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.