diff options
| author | Michael Wood <michael.g.wood@intel.com> | 2014-10-27 19:03:06 +0000 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-11-21 11:49:23 +0000 |
| commit | 5b0616ad7d7c3734f1818a56b631a2d254271678 (patch) | |
| tree | 6e9387b0b72536ff60746b58ea998e40620663fa /bitbake/lib/toaster/toastermain/settings.py | |
| parent | 2f3e40c5d8dfe7cc43511b95149f8d28f663ed1d (diff) | |
| download | ast2050-yocto-poky-5b0616ad7d7c3734f1818a56b631a2d254271678.zip ast2050-yocto-poky-5b0616ad7d7c3734f1818a56b631a2d254271678.tar.gz | |
bitbake: toaster: skip virtualenv when searching for django apps
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>
Diffstat (limited to 'bitbake/lib/toaster/toastermain/settings.py')
| -rw-r--r-- | bitbake/lib/toaster/toastermain/settings.py | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/bitbake/lib/toaster/toastermain/settings.py b/bitbake/lib/toaster/toastermain/settings.py index 8de3b52..0974b90 100644 --- a/bitbake/lib/toaster/toastermain/settings.py +++ b/bitbake/lib/toaster/toastermain/settings.py @@ -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,) |
