mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-06-12 16:50:07 +00:00
Code Issues Projects Releases Wiki Activity

bitbake: toaster: skip virtualenv when searching for django apps

Browse Source 
If we are using a virtualenv in the current search path we end up trying
to add modules to the django apps list which do not have the correct
load path or are internal to other modules. Fix this by skipping the
virtualenv path.

[YOCTO #6896]

(Bitbake rev: 3f614295d688c33b690f63ff7eb28e6988707919)

Signed-off-by: Michael Wood <michael.g.wood@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Michael Wood
2014-10-27 19:03:06 +00:00
committed by Richard Purdie
parent 2f3e40c5d8
commit 5b0616ad7d
2 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bitbake/lib/toaster/toastermain/settings.py
+4
View File
@@ -264,6 +264,10 @@ import os
currentdir = os.path.dirname(__file__)
for t in os.walk(os.path.dirname(currentdir)):
modulename = os.path.basename(t[0])
#if we have a virtualenv skip it to avoid incorrect imports
if os.environ.has_key('VIRTUAL_ENV') and os.environ['VIRTUAL_ENV'] in t[0]:
continue
if ("views.py" in t[2] or "models.py" in t[2]) and not modulename in INSTALLED_APPS:
INSTALLED_APPS = INSTALLED_APPS + (modulename,)
bitbake/lib/toaster/toastermain/urls.py
+4
View File
@@ -55,6 +55,10 @@ if toastermain.settings.MANAGED:
import os
currentdir = os.path.dirname(__file__)
for t in os.walk(os.path.dirname(currentdir)):
#if we have a virtualenv skip it to avoid incorrect imports
if os.environ.has_key('VIRTUAL_ENV') and os.environ['VIRTUAL_ENV'] in t[0]:
continue
if "urls.py" in t[2] and t[0] != currentdir:
modulename = os.path.basename(t[0])
urlpatterns.append( url(r'^' + modulename + '/', include ( modulename + '.urls')))