[bitbake-devel,9/9] toasterui: fix django settings environment value

Submitted by Alexandru DAMIAN on June 3, 2014, 3:26 p.m.


Message ID c103c988f5fbfb47f1757af2dc22d2c23e3ef861.1401808899.git.alexandru.damian@intel.com
State New
Headers show

Commit Message

Alexandru DAMIAN June 3, 2014, 3:26 p.m.
From: Alexandru DAMIAN <alexandru.damian@intel.com>

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.

Signed-off-by: Alexandru DAMIAN <alexandru.damian@intel.com>
 lib/bb/ui/buildinfohelper.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Patch hide | download patch | download mbox

diff --git a/lib/bb/ui/buildinfohelper.py b/lib/bb/ui/buildinfohelper.py
index 6965570..58df687 100644
--- a/lib/bb/ui/buildinfohelper.py
+++ b/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