Rooba
/
kombu
mirror of https://github.com/celery/kombu.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '2.5'

This commit is contained in:
Ask Solem 2013-05-01 17:58:36 +01:00
parent fee11d1ea9 7b968eae83
commit 2039e3c20c
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
AUTHORS
View File

@ -45,6 +45,7 @@ Jasper Bryant-Greene <jbg@rf.net.nz>
Jeff Balogh <me@jeffbalogh.org>
John Spray <jcspray@gmail.com>
John Watson <john@disqus.com>
Jonathan Halcrow <jonathan.halcrow@gmail.com>
Joseph Crosland <jcrosland@flumotion.com>
Keith Fitzgerald <ghostrocket@me.com>
Kevin McCarthy <me@kevinmccarthy.org>

2
kombu/entity.py
View File

@ -492,7 +492,7 @@ class Queue(MaybeChannelBound):
self.exchange.declare(nowait)
self.queue_declare(nowait, passive=False)
if self.exchange is not None:
if self.exchange and self.exchange.name:
self.queue_bind(nowait)
# - declare extra/multi-bindings.