diff options
Diffstat (limited to 'bitbake/lib/toaster/toastermain')
| -rw-r--r-- | bitbake/lib/toaster/toastermain/settings.py | 2 | ||||
| -rw-r--r-- | bitbake/lib/toaster/toastermain/urls.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/bitbake/lib/toaster/toastermain/settings.py b/bitbake/lib/toaster/toastermain/settings.py index 8662f393a9..78702fa59e 100644 --- a/bitbake/lib/toaster/toastermain/settings.py +++ b/bitbake/lib/toaster/toastermain/settings.py | |||
| @@ -321,7 +321,7 @@ currentdir = os.path.dirname(__file__) | |||
| 321 | for t in os.walk(os.path.dirname(currentdir)): | 321 | for t in os.walk(os.path.dirname(currentdir)): |
| 322 | modulename = os.path.basename(t[0]) | 322 | modulename = os.path.basename(t[0]) |
| 323 | #if we have a virtualenv skip it to avoid incorrect imports | 323 | #if we have a virtualenv skip it to avoid incorrect imports |
| 324 | if os.environ.has_key('VIRTUAL_ENV') and os.environ['VIRTUAL_ENV'] in t[0]: | 324 | if 'VIRTUAL_ENV' in os.environ and os.environ['VIRTUAL_ENV'] in t[0]: |
| 325 | continue | 325 | continue |
| 326 | 326 | ||
| 327 | if ("views.py" in t[2] or "models.py" in t[2]) and not modulename in INSTALLED_APPS: | 327 | if ("views.py" in t[2] or "models.py" in t[2]) and not modulename in INSTALLED_APPS: |
diff --git a/bitbake/lib/toaster/toastermain/urls.py b/bitbake/lib/toaster/toastermain/urls.py index 530a42ffab..1f8599edc3 100644 --- a/bitbake/lib/toaster/toastermain/urls.py +++ b/bitbake/lib/toaster/toastermain/urls.py | |||
| @@ -71,7 +71,7 @@ import os | |||
| 71 | currentdir = os.path.dirname(__file__) | 71 | currentdir = os.path.dirname(__file__) |
| 72 | for t in os.walk(os.path.dirname(currentdir)): | 72 | for t in os.walk(os.path.dirname(currentdir)): |
| 73 | #if we have a virtualenv skip it to avoid incorrect imports | 73 | #if we have a virtualenv skip it to avoid incorrect imports |
| 74 | if os.environ.has_key('VIRTUAL_ENV') and os.environ['VIRTUAL_ENV'] in t[0]: | 74 | if 'VIRTUAL_ENV' in os.environ and os.environ['VIRTUAL_ENV'] in t[0]: |
| 75 | continue | 75 | continue |
| 76 | 76 | ||
| 77 | if "urls.py" in t[2] and t[0] != currentdir: | 77 | if "urls.py" in t[2] and t[0] != currentdir: |
