diff options
| author | Evgeny Fadeev <evgeny.fadeev@gmail.com> | 2011-02-09 22:27:44 -0500 |
|---|---|---|
| committer | Evgeny Fadeev <evgeny.fadeev@gmail.com> | 2011-02-09 22:27:44 -0500 |
| commit | 0a1f402e2a585445d0f75b0d105e62cc0fa7b970 (patch) | |
| tree | 5591f62b92213da5416396e7e8d497171b52bf6a | |
| parent | 89a10249c97c99ecb1107cd3045822581fd9b680 (diff) | |
| download | askbot-0a1f402e2a585445d0f75b0d105e62cc0fa7b970.tar.gz askbot-0a1f402e2a585445d0f75b0d105e62cc0fa7b970.tar.bz2 askbot-0a1f402e2a585445d0f75b0d105e62cc0fa7b970.zip | |
fixed a bug where askbot would not work without the avatar app, and excluded avatar and adzone apps from the distribution
| -rw-r--r-- | MANIFEST.in | 2 | ||||
| -rw-r--r-- | askbot/__init__.py | 2 | ||||
| -rw-r--r-- | askbot/views/__init__.py | 4 |
3 files changed, 6 insertions, 2 deletions
diff --git a/MANIFEST.in b/MANIFEST.in index 769da138..bba6c7fe 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -10,3 +10,5 @@ exclude manage.py exclude __init__.py exclude urls.py exclude askbot/upfiles/*.* +recursive-exclude avatar * +recursive-exclude adzone * diff --git a/askbot/__init__.py b/askbot/__init__.py index ffe87d7f..6a67a686 100644 --- a/askbot/__init__.py +++ b/askbot/__init__.py @@ -19,4 +19,4 @@ def get_version(): """returns version of the askbot app this version is meaningful for pypi only """ - return '0.6.69' + return '0.6.70' diff --git a/askbot/views/__init__.py b/askbot/views/__init__.py index 87410e09..b9aaf8a9 100644 --- a/askbot/views/__init__.py +++ b/askbot/views/__init__.py @@ -6,4 +6,6 @@ from askbot.views import writers from askbot.views import commands from askbot.views import users from askbot.views import meta -from askbot.views import avatar_views +from django.conf import settings +if 'avatar' in settings.INSTALLED_APPS: + from askbot.views import avatar_views |