diff options
| author | Ben Hood <0x6e6562@gmail.com> | 2008-08-05 12:49:59 +0100 |
|---|---|---|
| committer | Ben Hood <0x6e6562@gmail.com> | 2008-08-05 12:49:59 +0100 |
| commit | 7c0f2eaaa36c8b4fa54e155090cc5a49c10ecd15 (patch) | |
| tree | 490a1850361ef9b42883cd65a3534ea918f9441c | |
| parent | 5d4aa65215de155534782159d9a343ffae9f1cd6 (diff) | |
| parent | 1e7afa80295dd14190ae104df1266e8a04ffeed0 (diff) | |
| download | rabbitmq-server-7c0f2eaaa36c8b4fa54e155090cc5a49c10ecd15.tar.gz | |
Merged default into 18994
| -rw-r--r-- | Makefile | 8 | ||||
| -rw-r--r-- | packaging/RPMS/Fedora/rabbitmq-server.spec | 2 | ||||
| -rw-r--r-- | packaging/debs/Debian/Makefile | 2 | ||||
| -rw-r--r-- | packaging/debs/Debian/debian/changelog | 2 | ||||
| -rw-r--r-- | src/rabbit_mnesia.erl | 2 |
5 files changed, 6 insertions, 10 deletions
@@ -5,7 +5,6 @@ EBIN_DIR=ebin INCLUDE_DIR=include SOURCES=$(wildcard $(SOURCE_DIR)/*.erl) TARGETS=$(EBIN_DIR)/rabbit_framing.beam $(patsubst $(SOURCE_DIR)/%.erl, $(EBIN_DIR)/%.beam,$(SOURCES)) -PLT=rabbit.plt WEB_URL=http://stage.rabbitmq.com/ ifndef USE_SPECS @@ -47,16 +46,13 @@ $(INCLUDE_DIR)/rabbit_framing.hrl $(SOURCE_DIR)/rabbit_framing.erl: codegen.py $ $(EBIN_DIR)/rabbit.boot $(EBIN_DIR)/rabbit.script: $(EBIN_DIR)/rabbit.app $(EBIN_DIR)/rabbit.rel $(TARGETS) erl -noshell -eval 'systools:make_script("ebin/rabbit", [{path, ["ebin"]}]), halt().' -$(PLT): $(TARGETS) - dialyzer -c $? --output_plt $@ $(shell if [ -f $@ ] ; then echo "--plt $@"; fi) - -dialyze: $(PLT) +dialyze: $(TARGETS) + dialyzer -c $? clean: cleandb rm -f $(EBIN_DIR)/*.beam rm -f $(EBIN_DIR)/rabbit.boot $(EBIN_DIR)/rabbit.script rm -f $(INCLUDE_DIR)/rabbit_framing.hrl $(SOURCE_DIR)/rabbit_framing.erl codegen.pyc - rm -f $(PLT) cleandb: stop-node erl -mnesia dir '"$(MNESIA_DIR)"' -noshell -eval 'lists:foreach(fun file:delete/1, filelib:wildcard(mnesia:system_info(directory) ++ "/*")), halt().' diff --git a/packaging/RPMS/Fedora/rabbitmq-server.spec b/packaging/RPMS/Fedora/rabbitmq-server.spec index ca0b6b8e..dd12e1e5 100644 --- a/packaging/RPMS/Fedora/rabbitmq-server.spec +++ b/packaging/RPMS/Fedora/rabbitmq-server.spec @@ -119,7 +119,7 @@ fi rm -rf $RPM_BUILD_ROOT %changelog -* Wed Jul 9 2008 Tony Garnock-Jones <tonyg@lshift.net> 1.4.0 +* Thu Jul 24 2008 Tony Garnock-Jones <tonyg@lshift.net> 1.4.0 - New upstream release * Mon Mar 3 2008 Adrien Pierard <adrian@lshift.net> 1.3.0 diff --git a/packaging/debs/Debian/Makefile b/packaging/debs/Debian/Makefile index b49094e2..aeb958a7 100644 --- a/packaging/debs/Debian/Makefile +++ b/packaging/debs/Debian/Makefile @@ -20,7 +20,7 @@ package: clean cp -r debian $(UNPACKED_DIR) chmod -R a+x $(UNPACKED_DIR)/debian UNOFFICIAL_RELEASE=$(UNOFFICIAL_RELEASE) VERSION=$(VERSION) ./check-changelog.sh rabbitmq-server $(UNPACKED_DIR) - cd $(UNPACKED_DIR); dpkg-buildpackage -rfakeroot $(SIGNING) + cd $(UNPACKED_DIR); GNUPGHOME=$(GNUPG_PATH)/.gnupg dpkg-buildpackage -rfakeroot $(SIGNING) rm -rf $(UNPACKED_DIR) clean: diff --git a/packaging/debs/Debian/debian/changelog b/packaging/debs/Debian/debian/changelog index e6b12937..07f5a8dd 100644 --- a/packaging/debs/Debian/debian/changelog +++ b/packaging/debs/Debian/debian/changelog @@ -2,7 +2,7 @@ rabbitmq-server (1.4.0-1) testing; urgency=low * New Upstream Release - -- Tony Garnock-Jones <tonyg@lshift.net> Wed, 09 Jul 2008 14:31:23 +0100 + -- Tony Garnock-Jones <tonyg@lshift.net> Thu, 24 Jul 2008 13:21:48 +0100 rabbitmq-server (1.3.0-1) testing; urgency=low diff --git a/src/rabbit_mnesia.erl b/src/rabbit_mnesia.erl index b1ab3da2..4ae367ba 100644 --- a/src/rabbit_mnesia.erl +++ b/src/rabbit_mnesia.erl @@ -240,7 +240,6 @@ init_db(ClusterNodes) -> ClusterNodes}}) end; {ok, [_|_]} -> - ok = ensure_schema_integrity(), ok = wait_for_tables(), ok = create_local_table_copies( case IsDiskNode of @@ -324,6 +323,7 @@ create_local_table_copy(Tab, Type) -> ok. wait_for_tables() -> + ok = ensure_schema_integrity(), case mnesia:wait_for_tables(table_names(), 30000) of ok -> ok; {timeout, BadTabs} -> |