diff options
author | Ed Bartosh <ed.bartosh@linux.intel.com> | 2015-12-02 10:02:50 -0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-12-07 17:37:10 +0000 |
commit | 4c1e5ec29ace325d03a5a1386e384201a00f15cf (patch) | |
tree | eafadc88924ac99464de68d1ab2108808cec41d0 /bitbake/lib/toaster/toastermain | |
parent | 990289511b7dc56580f2cecdda75fa14f436966d (diff) | |
download | poky-4c1e5ec29ace325d03a5a1386e384201a00f15cf.tar.gz |
bitbake: toaster: remove usage of BUILD_MODE variable
As both modes can be used at the same time we can't have any
difference in UI between modes.
Removed all conditional statements that used BUILD_MODE.
(Bitbake rev: 4ce1559c2558bd0fd278ff02a1a93bec03c4156b)
Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com>
Signed-off-by: brian avery <avery.brian@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake/lib/toaster/toastermain')
-rw-r--r-- | bitbake/lib/toaster/toastermain/settings.py | 3 | ||||
-rw-r--r-- | bitbake/lib/toaster/toastermain/urls.py | 9 |
2 files changed, 4 insertions, 8 deletions
diff --git a/bitbake/lib/toaster/toastermain/settings.py b/bitbake/lib/toaster/toastermain/settings.py index b28ddb2b0d..de686b2edc 100644 --- a/bitbake/lib/toaster/toastermain/settings.py +++ b/bitbake/lib/toaster/toastermain/settings.py | |||
@@ -92,9 +92,6 @@ 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 | BUILD_MODE = False | ||
96 | if 'TOASTER_MANAGED' in os.environ and os.environ['TOASTER_MANAGED'] == "1": | ||
97 | BUILD_MODE = True | ||
98 | 95 | ||
99 | # Allows current database settings to be exported as a DATABASE_URL environment variable value | 96 | # Allows current database settings to be exported as a DATABASE_URL environment variable value |
100 | 97 | ||
diff --git a/bitbake/lib/toaster/toastermain/urls.py b/bitbake/lib/toaster/toastermain/urls.py index 6c4a953b41..5ce5a924d8 100644 --- a/bitbake/lib/toaster/toastermain/urls.py +++ b/bitbake/lib/toaster/toastermain/urls.py | |||
@@ -59,12 +59,11 @@ if toastermain.settings.DEBUG_PANEL_ENABLED: | |||
59 | urlpatterns.insert(1, url(r'', include(debug_toolbar.urls))) | 59 | urlpatterns.insert(1, url(r'', include(debug_toolbar.urls))) |
60 | #logger.info("Enabled django_toolbar extension") | 60 | #logger.info("Enabled django_toolbar extension") |
61 | 61 | ||
62 | urlpatterns = [ | ||
63 | # Uncomment the next line to enable the admin: | ||
64 | url(r'^admin/', include(admin.site.urls)), | ||
65 | ] + urlpatterns | ||
62 | 66 | ||
63 | if toastermain.settings.BUILD_MODE: | ||
64 | urlpatterns = [ | ||
65 | # Uncomment the next line to enable the admin: | ||
66 | url(r'^admin/', include(admin.site.urls)), | ||
67 | ] + urlpatterns | ||
68 | # Automatically discover urls.py in various apps, beside our own | 67 | # Automatically discover urls.py in various apps, beside our own |
69 | # and map module directories to the patterns | 68 | # and map module directories to the patterns |
70 | 69 | ||