Skip to content

Commit 1e80634

Browse files
committed
Merge branch 'release/0.6.2'
2 parents 131e29b + 94211df commit 1e80634

File tree

3 files changed

+7
-2
lines changed

3 files changed

+7
-2
lines changed

celery_haystack/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
__version__ = '0.6.1'
1+
__version__ = '0.6.2'

celery_haystack/tasks.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
except ImportError, e:
1717
raise ImproperlyConfigured("Haystack couldn't be imported: %s" % e)
1818

19-
if settings.CELERY_HAYSTACK_TRANSACTION_SAFE and not settings.CELERY_ALWAYS_EAGER:
19+
if settings.CELERY_HAYSTACK_TRANSACTION_SAFE and not getattr(settings, 'CELERY_ALWAYS_EAGER', False):
2020
from djcelery_transactions import PostTransactionTask as Task
2121
else:
2222
from celery.task import Task # noqa

docs/changelog.rst

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,11 @@
11
Changelog
22
=========
33

4+
v0.6.2 (2012-06-28)
5+
-------------------
6+
7+
* Fixed AttributeError in settings handling.
8+
49
v0.6.1 (2012-06-27)
510
-------------------
611

0 commit comments

Comments
 (0)