diff options
Diffstat (limited to 'bitbake/lib/toaster/bldcontrol/management')
| -rw-r--r-- | bitbake/lib/toaster/bldcontrol/management/commands/checksettings.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/bitbake/lib/toaster/bldcontrol/management/commands/checksettings.py b/bitbake/lib/toaster/bldcontrol/management/commands/checksettings.py index d11166ef53..582114ac97 100644 --- a/bitbake/lib/toaster/bldcontrol/management/commands/checksettings.py +++ b/bitbake/lib/toaster/bldcontrol/management/commands/checksettings.py | |||
| @@ -75,7 +75,10 @@ class Command(BaseCommand): | |||
| 75 | call_command("loaddata", "settings") | 75 | call_command("loaddata", "settings") |
| 76 | template_conf = os.environ.get("TEMPLATECONF", "") | 76 | template_conf = os.environ.get("TEMPLATECONF", "") |
| 77 | 77 | ||
| 78 | if "poky" in template_conf: | 78 | if ToasterSetting.objects.filter(name='CUSTOM_XML_ONLY').count() > 0: |
| 79 | # only use the custom settings | ||
| 80 | pass | ||
| 81 | elif "poky" in template_conf: | ||
| 79 | print("Loading poky configuration") | 82 | print("Loading poky configuration") |
| 80 | call_command("loaddata", "poky") | 83 | call_command("loaddata", "poky") |
| 81 | else: | 84 | else: |