diff options
| author |   Michael Wood <michael.g.wood@intel.com> | 2014-10-27 19:03:06 +0000 |
|---|---|---|
| committer |   Alexandru DAMIAN <alexandru.damian@intel.com> | 2014-11-20 15:43:57 +0000 |
| commit | 3f614295d688c33b690f63ff7eb28e6988707919 (patch) | |
| tree | 9d8018dbd655434c9749ab20573611b834f1896c | |
| parent | d4a47bc84f762666a847f1152cc2e75c9ef36092 (diff) | |
| download | bitbake-3f614295d688c33b690f63ff7eb28e6988707919.tar.gz | |
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]
Signed-off-by: Michael Wood <michael.g.wood@intel.com>
| -rw-r--r-- | lib/toaster/toastermain/settings.py | 4 | ||||
| -rw-r--r-- | lib/toaster/toastermain/urls.py | 4 |
2 files changed, 8 insertions, 0 deletions
diff --git a/lib/toaster/toastermain/settings.py b/lib/toaster/toastermain/settings.py index 8de3b52f3..0974b9052 100644 --- a/lib/toaster/toastermain/settings.py +++ b/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,) diff --git a/lib/toaster/toastermain/urls.py b/lib/toaster/toastermain/urls.py index 1ae6245cc..549fda12d 100644 --- a/lib/toaster/toastermain/urls.py +++ b/lib/toaster/toastermain/urls.py @@ -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'))) |