summaryrefslogtreecommitdiffstats
path: root/bitbake/lib/toaster/toastermain
diff options
context:
space:
mode:
Diffstat (limited to 'bitbake/lib/toaster/toastermain')
-rw-r--r--bitbake/lib/toaster/toastermain/settings.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/bitbake/lib/toaster/toastermain/settings.py b/bitbake/lib/toaster/toastermain/settings.py
index ea7c3534da..b6a42c0626 100644
--- a/bitbake/lib/toaster/toastermain/settings.py
+++ b/bitbake/lib/toaster/toastermain/settings.py
@@ -211,8 +211,6 @@ MIDDLEWARE_CLASSES = (
211 'django.middleware.csrf.CsrfViewMiddleware', 211 'django.middleware.csrf.CsrfViewMiddleware',
212 'django.contrib.auth.middleware.AuthenticationMiddleware', 212 'django.contrib.auth.middleware.AuthenticationMiddleware',
213 'django.contrib.messages.middleware.MessageMiddleware', 213 'django.contrib.messages.middleware.MessageMiddleware',
214 'django.middleware.cache.UpdateCacheMiddleware',
215 'django.middleware.cache.FetchFromCacheMiddleware',
216 # Uncomment the next line for simple clickjacking protection: 214 # Uncomment the next line for simple clickjacking protection:
217 # 'django.middleware.clickjacking.XFrameOptionsMiddleware', 215 # 'django.middleware.clickjacking.XFrameOptionsMiddleware',
218) 216)
@@ -233,6 +231,9 @@ CACHES = {
233from os.path import dirname as DN 231from os.path import dirname as DN
234SITE_ROOT=DN(DN(os.path.abspath(__file__))) 232SITE_ROOT=DN(DN(os.path.abspath(__file__)))
235 233
234import subprocess
235TOASTER_VERSION = subprocess.Popen('cd %s; git branch | grep "^* " | tr -d "* "' % SITE_ROOT, shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE).communicate()[0]
236
236ROOT_URLCONF = 'toastermain.urls' 237ROOT_URLCONF = 'toastermain.urls'
237 238
238# Python dotted path to the WSGI application used by Django's runserver. 239# Python dotted path to the WSGI application used by Django's runserver.