diff options
| author | Ben Hood <0x6e6562@gmail.com> | 2008-09-06 17:42:57 +0100 |
|---|---|---|
| committer | Ben Hood <0x6e6562@gmail.com> | 2008-09-06 17:42:57 +0100 |
| commit | 8b32014455159718524fba0ebcde08bf998596d5 (patch) | |
| tree | ce645b69fa5b479dc8ab69d60cd1b1a8911c517e | |
| parent | 5830f2819d939d65bfbb16ca4de620ab1c8a1ea9 (diff) | |
| parent | e5bf57a323e4727ce005b0d0e6f883921a9c21c6 (diff) | |
| download | rabbitmq-server-git-8b32014455159718524fba0ebcde08bf998596d5.tar.gz | |
Merged default into 18776
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | packaging/debs/Debian/Makefile | 2 | ||||
| -rw-r--r-- | src/rabbit_channel.erl | 2 | ||||
| -rw-r--r-- | src/rabbit_multi.erl | 2 |
4 files changed, 4 insertions, 4 deletions
@@ -115,7 +115,7 @@ srcdist: distclean $(MAKE) VERSION=$(VERSION) GENERIC_STAGE_DIR=dist/$(TARBALL_NAME) generic_stage mkdir -p dist/$(TARBALL_NAME)/codegen - cp -r $(AMQP_CODEGEN_DIR)/* dist/$(TARBALL_NAME)/codegen/. + cp -r $(AMQP_CODEGEN_DIR)/* dist/$(TARBALL_NAME)/codegen/ cp codegen.py Makefile dist/$(TARBALL_NAME) cp -r scripts dist/$(TARBALL_NAME) diff --git a/packaging/debs/Debian/Makefile b/packaging/debs/Debian/Makefile index aeb958a7c3..dd74c31ea1 100644 --- a/packaging/debs/Debian/Makefile +++ b/packaging/debs/Debian/Makefile @@ -18,7 +18,7 @@ package: clean make -C ../.. check_tools tar -zxvf $(TARBALL_DIR)/$(TARBALL) cp -r debian $(UNPACKED_DIR) - chmod -R a+x $(UNPACKED_DIR)/debian + chmod a+x $(UNPACKED_DIR)/debian/rules UNOFFICIAL_RELEASE=$(UNOFFICIAL_RELEASE) VERSION=$(VERSION) ./check-changelog.sh rabbitmq-server $(UNPACKED_DIR) cd $(UNPACKED_DIR); GNUPGHOME=$(GNUPG_PATH)/.gnupg dpkg-buildpackage -rfakeroot $(SIGNING) rm -rf $(UNPACKED_DIR) diff --git a/src/rabbit_channel.erl b/src/rabbit_channel.erl index 070760a98a..f29456a3c5 100644 --- a/src/rabbit_channel.erl +++ b/src/rabbit_channel.erl @@ -531,7 +531,7 @@ handle_method(#'queue.declare'{queue = QueueNameBin, <<>> -> rabbit_misc:binstring_guid("amq.gen"); Other -> check_name('queue', Other) end, - QueueName = rabbit_misc:r(VHostPath, queue, ActualNameBin), + QueueName = rabbit_misc:r(VHostPath, queue, ActualNameBin), Finish(rabbit_amqqueue:declare(QueueName, Durable, AutoDelete, Args)); Other -> Other diff --git a/src/rabbit_multi.erl b/src/rabbit_multi.erl index cd92f1ac4a..bde6933631 100644 --- a/src/rabbit_multi.erl +++ b/src/rabbit_multi.erl @@ -233,7 +233,7 @@ stop_node({Node, Pid}, RpcTimeout) -> rpc:call(Node, rabbit, stop_and_halt, []), case kill_wait(Pid, RpcTimeout, false) of false -> kill_wait(Pid, RpcTimeout, true); - true -> ok + true -> ok end, io:format("OK~n", []). |