toaster.lists.yoctoproject.org archive mirror
 help / color / mirror / Atom feed
From: Awais Belal <awais_belal@mentor.com>
To: <toaster@yoctoproject.org>
Subject: [sumo][PATCH 6/8] toaster/checksettings: allow CUSTOM_XML_ONLY setting through env
Date: Fri, 6 Jul 2018 15:43:57 +0500	[thread overview]
Message-ID: <1530873839-4445-6-git-send-email-awais_belal@mentor.com> (raw)
In-Reply-To: <1530873839-4445-1-git-send-email-awais_belal@mentor.com>

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 in scenarios where modifying
settings.xml is not achieveable.

Signed-off-by: Awais Belal <awais_belal@mentor.com>
---
 bitbake/lib/toaster/bldcontrol/management/commands/checksettings.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/bitbake/lib/toaster/bldcontrol/management/commands/checksettings.py b/bitbake/lib/toaster/bldcontrol/management/commands/checksettings.py
index 823c6f1..14298d9 100644
--- a/bitbake/lib/toaster/bldcontrol/management/commands/checksettings.py
+++ b/bitbake/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:
-- 
2.7.4



  parent reply	other threads:[~2018-07-06 10:44 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-07-06 10:43 [sumo][PATCH 1/8] toaster: allow pokydirname to be evaluated when all layers are local Awais Belal
2018-07-06 10:43 ` [sumo][PATCH 2/8] toaster: use a more flexible way to find bitbake Awais Belal
2018-07-06 10:43 ` [sumo][PATCH 3/8] toaster: allow TOASTER_DIR to be overridden from cmdline Awais Belal
2018-07-06 10:43 ` [sumo][PATCH 4/8] toaster/widgets.py: avoid divide by zero issues Awais Belal
2018-07-06 10:43 ` [sumo][PATCH 5/8] toastergui/newproject.html: fix release divs Awais Belal
2018-07-06 10:43 ` Awais Belal [this message]
2018-07-06 10:43 ` [sumo][PATCH 7/8] toaster/models.py: allow local paths for custom recipe's base Awais Belal
2018-07-06 10:43 ` [sumo][PATCH 8/8] toaster/layerdetails.js: don't hide local layer info Awais Belal

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1530873839-4445-6-git-send-email-awais_belal@mentor.com \
    --to=awais_belal@mentor.com \
    --cc=toaster@yoctoproject.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).