summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexandru DAMIAN <alexandru.damian@intel.com>2014-06-03 16:26:18 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-06-06 10:32:55 +0100
commit36a5f66096116d6a4b7b5c0e2141d5ea8ec500f9 (patch)
treea0151a7e5fc6fb7b77297a8cbfba538f91ff671f
parent07cd9a3b3494d6d6f5f015aece686e79d7db6c78 (diff)
downloadpoky-36a5f66096116d6a4b7b5c0e2141d5ea8ec500f9.tar.gz
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 <alexandru.damian@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--bitbake/lib/bb/ui/buildinfohelper.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/bitbake/lib/bb/ui/buildinfohelper.py b/bitbake/lib/bb/ui/buildinfohelper.py
index 69655709d3..58df687ca1 100644
--- a/bitbake/lib/bb/ui/buildinfohelper.py
+++ b/bitbake/lib/bb/ui/buildinfohelper.py
@@ -22,7 +22,7 @@ import bb
22import re 22import re
23import ast 23import ast
24 24
25os.environ.setdefault("DJANGO_SETTINGS_MODULE", "toaster.toastermain.settings") 25os.environ["DJANGO_SETTINGS_MODULE"] = "toaster.toastermain.settings"
26 26
27import toaster.toastermain.settings as toaster_django_settings 27import toaster.toastermain.settings as toaster_django_settings
28from toaster.orm.models import Build, Task, Recipe, Layer_Version, Layer, Target, LogMessage, HelpText 28from toaster.orm.models import Build, Task, Recipe, Layer_Version, Layer, Target, LogMessage, HelpText