diff options
| author | Hubert Plociniczak <hubert@lshift.net> | 2008-10-23 16:11:32 +0100 |
|---|---|---|
| committer | Hubert Plociniczak <hubert@lshift.net> | 2008-10-23 16:11:32 +0100 |
| commit | 6ca8e645a5a5823702d2ecc8fba578c4c76f7aef (patch) | |
| tree | 00eecc707b9edd70d91a126b7cd540d7538c5f32 | |
| parent | 32e23ae493e206ddda53adb431f06781c149fbe4 (diff) | |
| parent | c6bf18acc51cfa569d97de4913b55ae56dfc8a69 (diff) | |
| download | rabbitmq-server-6ca8e645a5a5823702d2ecc8fba578c4c76f7aef.tar.gz | |
Merge bug19382 into default
| -rw-r--r-- | packaging/debs/Debian/Makefile | 4 | ||||
| -rw-r--r-- | src/rabbit_router.erl | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/packaging/debs/Debian/Makefile b/packaging/debs/Debian/Makefile index dd74c31e..3e74cb52 100644 --- a/packaging/debs/Debian/Makefile +++ b/packaging/debs/Debian/Makefile @@ -1,5 +1,6 @@ TARBALL_DIR=../../../dist TARBALL=$(shell (cd $(TARBALL_DIR); echo rabbitmq-server-[0-9]*.tar.gz)) +DEBIAN_ORIG_TARBALL=$(shell echo $(TARBALL) | sed -e 's:\(.*\)-\(.*\)\(\.tar\.gz\):\1_\2\.orig\3:g') VERSION=$(shell echo $(TARBALL) | sed -e 's:rabbitmq-server-\(.*\)\.tar\.gz:\1:g') UNPACKED_DIR=rabbitmq-server-$(VERSION) PACKAGENAME=rabbitmq-server @@ -16,7 +17,8 @@ all: package: clean make -C ../.. check_tools - tar -zxvf $(TARBALL_DIR)/$(TARBALL) + cp $(TARBALL_DIR)/$(TARBALL) $(DEBIAN_ORIG_TARBALL) + tar -zxvf $(DEBIAN_ORIG_TARBALL) cp -r debian $(UNPACKED_DIR) chmod a+x $(UNPACKED_DIR)/debian/rules UNOFFICIAL_RELEASE=$(UNOFFICIAL_RELEASE) VERSION=$(VERSION) ./check-changelog.sh rabbitmq-server $(UNPACKED_DIR) diff --git a/src/rabbit_router.erl b/src/rabbit_router.erl index 41a8d64c..a2337647 100644 --- a/src/rabbit_router.erl +++ b/src/rabbit_router.erl @@ -150,11 +150,9 @@ run_bindings(QPids, IsMandatory, IsImmediate, Txn, Message) -> fun (QPid, {Routed, Handled}) -> case catch rabbit_amqqueue:deliver(IsMandatory, IsImmediate, Txn, Message, QPid) of - true -> {true, [QPid | Handled]}; - false -> {true, Handled}; - {'EXIT', Reason} -> rabbit_log:warning("delivery to ~p failed:~n~p~n", - [QPid, Reason]), - {Routed, Handled} + true -> {true, [QPid | Handled]}; + false -> {true, Handled}; + {'EXIT', _Reason} -> {Routed, Handled} end end, {false, []}, |