[oe-commits] [bitbake] 06/10: toaster/checksettings: allow CUSTOM_XML_ONLY setting through env

[git at git.openembedded.org]

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

rpurdie pushed a commit to branch master-next
in repository bitbake.

commit 55333f1c3ded1c53120e6cb32b440cc707521e2b
Author: Awais Belal <awais_belal at mentor.com>
AuthorDate: Sun Aug 26 15:33:29 2018 -0700

    toaster/checksettings: allow CUSTOM_XML_ONLY setting through env
    
    This change allows the CUSTOM_XML_ONLY toaster setting to be
    provided through the environment so the user can do this without
    mingling with the settings.xml, for scenarios where modifying
    settings.xml is not achievable.
    
    [YOCTO #12891]
    
    Signed-off-by: Awais Belal <awais_belal at mentor.com>
    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 | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/toaster/bldcontrol/management/commands/checksettings.py b/lib/toaster/bldcontrol/management/commands/checksettings.py
index 823c6f1..14298d9 100644
--- a/lib/toaster/bldcontrol/management/commands/checksettings.py
+++ b/lib/toaster/bldcontrol/management/commands/checksettings.py
@@ -74,8 +74,9 @@ class Command(BaseCommand):
                         print("Loading default settings")
                         call_command("loaddata", "settings")
                         template_conf = os.environ.get("TEMPLATECONF", "")
+                        custom_xml_only = os.environ.get("CUSTOM_XML_ONLY")
 
-                        if ToasterSetting.objects.filter(name='CUSTOM_XML_ONLY').count() > 0:
+                        if ToasterSetting.objects.filter(name='CUSTOM_XML_ONLY').count() > 0 or (not custom_xml_only == None):
                             # only use the custom settings
                             pass
                         elif "poky" in template_conf:

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