diff options
| author |   Elliot Smith <elliot.smith@intel.com> | 2015-10-17 10:45:48 -0700 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-10-27 07:24:31 +0000 |
| commit | bbac0f092a20ab76be510d403fb946ea90f6597e (patch) | |
| tree | 7cf6ba784f20cebac8e9448d02ce09ca3a506f13 /bitbake | |
| parent | 851f0d82d9744e2eebb1f382a9963f3815b9822c (diff) | |
| download | openembedded-core-contrib-bbac0f092a20ab76be510d403fb946ea90f6597e.tar.gz | |
bitbake: toaster: Add BUILD_MODE flag to context
We set a TOASTER_MANAGED env variable in the startup script,
which has a value of "1" if Toaster should run in build mode.
Add a BUILD_MODE variable to settings.py which is True if
TOASTER_MANAGED is set to "1", False otherwise.
Add this to the context for every template, so we can use this
information to conditionally alter the content of pages
according to the mode we're in.
[YOCTO #8514]
(Bitbake rev: f9cf4739fc85c9760ce748323dc7c8de3fa7eaec)
Signed-off-by: Elliot Smith <elliot.smith@intel.com>
Signed-off-by: brian avery <avery.brian@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake')
| -rwxr-xr-x | bitbake/lib/toaster/toastergui/views.py | 4 | ||||
| -rw-r--r-- | bitbake/lib/toaster/toastermain/settings.py | 6 | ||||
| -rw-r--r-- | bitbake/lib/toaster/toastermain/urls.py | 2 |
3 files changed, 7 insertions, 5 deletions
diff --git a/bitbake/lib/toaster/toastergui/views.py b/bitbake/lib/toaster/toastergui/views.py index e2f2874539..10bbef5ca4 100755 --- a/bitbake/lib/toaster/toastergui/views.py +++ b/bitbake/lib/toaster/toastergui/views.py @@ -1880,6 +1880,10 @@ def managedcontextprocessor(request): "projects": projects, "non_cli_projects": projects.exclude(is_default=True), "DEBUG" : toastermain.settings.DEBUG, + + # True if Toaster is in build mode, False otherwise + "BUILD_MODE": toastermain.settings.BUILD_MODE, + "CUSTOM_IMAGE" : toastermain.settings.CUSTOM_IMAGE, "TOASTER_BRANCH": toastermain.settings.TOASTER_BRANCH, "TOASTER_REVISION" : toastermain.settings.TOASTER_REVISION, diff --git a/bitbake/lib/toaster/toastermain/settings.py b/bitbake/lib/toaster/toastermain/settings.py index 6439d68c3f..b28ddb2b0d 100644 --- a/bitbake/lib/toaster/toastermain/settings.py +++ b/bitbake/lib/toaster/toastermain/settings.py @@ -92,11 +92,9 @@ if 'DATABASE_URL' in os.environ: else: raise Exception("FIXME: Please implement missing database url schema for url: %s" % dburl) - +BUILD_MODE = False if 'TOASTER_MANAGED' in os.environ and os.environ['TOASTER_MANAGED'] == "1": - MANAGED = True -else: - MANAGED = False + BUILD_MODE = True # Allows current database settings to be exported as a DATABASE_URL environment variable value diff --git a/bitbake/lib/toaster/toastermain/urls.py b/bitbake/lib/toaster/toastermain/urls.py index 521588a6ad..6c4a953b41 100644 --- a/bitbake/lib/toaster/toastermain/urls.py +++ b/bitbake/lib/toaster/toastermain/urls.py @@ -60,7 +60,7 @@ if toastermain.settings.DEBUG_PANEL_ENABLED: #logger.info("Enabled django_toolbar extension") -if toastermain.settings.MANAGED: +if toastermain.settings.BUILD_MODE: urlpatterns = [ # Uncomment the next line to enable the admin: url(r'^admin/', include(admin.site.urls)), |