Merge default into amqp_0_9_1

4 files changed, 11 insertions, 4 deletions

diff --git a/packaging/common/rabbitmq-server.init b/packaging/common/rabbitmq-server.init
index dc30597569..39d239835c 100644
--- a/packaging/common/rabbitmq-server.init
+++ b/packaging/common/rabbitmq-server.init
@@ -66,8 +66,6 @@ stop_rabbitmq () {
         $DAEMON stop_all > ${INIT_LOG_DIR}/shutdown_log 2> ${INIT_LOG_DIR}/shutdown_err
         RETVAL=$?
         if [ $RETVAL = 0 ] ; then
-            # Try to stop epmd if run by the rabbitmq user
-            pkill -u rabbitmq epmd || :
             [ -n "$LOCK_FILE" ] && rm -rf $LOCK_FILE
         else
             echo FAILED - check ${INIT_LOG_DIR}/shutdown_log, _err
diff --git a/packaging/debs/Debian/debian/postrm b/packaging/debs/Debian/debian/postrm.in
index a999d95b29..bfcf1f530e 100644
--- a/packaging/debs/Debian/debian/postrm
+++ b/packaging/debs/Debian/debian/postrm.in
@@ -34,7 +34,15 @@ case "$1" in
         if [ -d /etc/rabbitmq ]; then
                 rm -r /etc/rabbitmq
         fi
+        # Remove traces of plugins
+        rm -rf @RABBIT_LIB@/priv @RABBIT_LIB@/plugins
+        for ext in rel script boot ; do
+                rm -f @RABBIT_LIB@/ebin/rabbit.$ext
+        done
         if getent passwd rabbitmq >/dev/null; then
+                # Stop epmd if run by the rabbitmq user
+                pkill -u rabbitmq epmd || :
+
                 deluser rabbitmq
         fi
         if getent group rabbitmq >/dev/null; then
diff --git a/packaging/debs/Debian/debian/rules b/packaging/debs/Debian/debian/rules
index 5e3579557a..3799c4387a 100644
--- a/packaging/debs/Debian/debian/rules
+++ b/packaging/debs/Debian/debian/rules
@@ -20,3 +20,4 @@ install/rabbitmq-server::
 	for script in rabbitmq-activate-plugins rabbitmq-deactivate-plugins; do \
 		install -p -D -m 0755 debian/rabbitmq-asroot-script-wrapper $(DEB_DESTDIR)usr/sbin/$$script; \
 	done
+	sed -e 's|@RABBIT_LIB@|/usr/lib/rabbitmq/lib/rabbitmq_server-$(DEB_UPSTREAM_VERSION)|g' <debian/postrm.in >debian/postrm
diff --git a/src/rabbit_amqqueue_process.erl b/src/rabbit_amqqueue_process.erl
index 8b1d79c564..15b9d05739 100644
--- a/src/rabbit_amqqueue_process.erl
+++ b/src/rabbit_amqqueue_process.erl
@@ -283,13 +283,13 @@ possibly_unblock(State, ChPid, Update) ->
             store_ch_record(NewC),
             case ch_record_state_transition(C, NewC) of
                 ok      -> State;
-                unblock -> {NewBlockedeConsumers, NewActiveConsumers} =
+                unblock -> {NewBlockedConsumers, NewActiveConsumers} =
                                move_consumers(ChPid,
                                               State#q.blocked_consumers,
                                               State#q.active_consumers),
                            run_poke_burst(
                              State#q{active_consumers = NewActiveConsumers,
-                                     blocked_consumers = NewBlockedeConsumers})
+                                     blocked_consumers = NewBlockedConsumers})
             end
     end.