diff options
-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): | |||
1880 | "projects": projects, | 1880 | "projects": projects, |
1881 | "non_cli_projects": projects.exclude(is_default=True), | 1881 | "non_cli_projects": projects.exclude(is_default=True), |
1882 | "DEBUG" : toastermain.settings.DEBUG, | 1882 | "DEBUG" : toastermain.settings.DEBUG, |
1883 | |||
1884 | # True if Toaster is in build mode, False otherwise | ||
1885 | "BUILD_MODE": toastermain.settings.BUILD_MODE, | ||
1886 | |||
1883 | "CUSTOM_IMAGE" : toastermain.settings.CUSTOM_IMAGE, | 1887 | "CUSTOM_IMAGE" : toastermain.settings.CUSTOM_IMAGE, |
1884 | "TOASTER_BRANCH": toastermain.settings.TOASTER_BRANCH, | 1888 | "TOASTER_BRANCH": toastermain.settings.TOASTER_BRANCH, |
1885 | "TOASTER_REVISION" : toastermain.settings.TOASTER_REVISION, | 1889 | "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: | |||
92 | else: | 92 | else: |
93 | raise Exception("FIXME: Please implement missing database url schema for url: %s" % dburl) | 93 | raise Exception("FIXME: Please implement missing database url schema for url: %s" % dburl) |
94 | 94 | ||
95 | 95 | BUILD_MODE = False | |
96 | if 'TOASTER_MANAGED' in os.environ and os.environ['TOASTER_MANAGED'] == "1": | 96 | if 'TOASTER_MANAGED' in os.environ and os.environ['TOASTER_MANAGED'] == "1": |
97 | MANAGED = True | 97 | BUILD_MODE = True |
98 | else: | ||
99 | MANAGED = False | ||
100 | 98 | ||
101 | # Allows current database settings to be exported as a DATABASE_URL environment variable value | 99 | # Allows current database settings to be exported as a DATABASE_URL environment variable value |
102 | 100 | ||
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: | |||
60 | #logger.info("Enabled django_toolbar extension") | 60 | #logger.info("Enabled django_toolbar extension") |
61 | 61 | ||
62 | 62 | ||
63 | if toastermain.settings.MANAGED: | 63 | if toastermain.settings.BUILD_MODE: |
64 | urlpatterns = [ | 64 | urlpatterns = [ |
65 | # Uncomment the next line to enable the admin: | 65 | # Uncomment the next line to enable the admin: |
66 | url(r'^admin/', include(admin.site.urls)), | 66 | url(r'^admin/', include(admin.site.urls)), |