From c3e1804e82677d9fe4cc04e535264628295de44d Mon Sep 17 00:00:00 2001 From: Alexandru DAMIAN Date: Tue, 3 Jun 2014 16:26:18 +0100 Subject: [PATCH] bitbake: toasterui: fix django settings environment value Previously, the buildinfohelper only set a django settings module environment variable if none were set. This may lead to problems when the starting the toasterui from an already existing Django environment. As such, we always override the variable to provide the correct name for the local Django settings module. (Bitbake rev: 8271e61a2fbddd3fc49556829675478d7505d58f) Signed-off-by: Alexandru DAMIAN Signed-off-by: Richard Purdie --- bitbake/lib/bb/ui/buildinfohelper.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bitbake/lib/bb/ui/buildinfohelper.py b/bitbake/lib/bb/ui/buildinfohelper.py index 6965570..58df687 100644 --- a/bitbake/lib/bb/ui/buildinfohelper.py +++ b/bitbake/lib/bb/ui/buildinfohelper.py @@ -22,7 +22,7 @@ import bb import re import ast -os.environ.setdefault("DJANGO_SETTINGS_MODULE", "toaster.toastermain.settings") +os.environ["DJANGO_SETTINGS_MODULE"] = "toaster.toastermain.settings" import toaster.toastermain.settings as toaster_django_settings from toaster.orm.models import Build, Task, Recipe, Layer_Version, Layer, Target, LogMessage, HelpText -- 2.7.4