[icinga-checkins] icinga.org: icinga-web/next: make db-deinitialize starts db-initialize

git at icinga.org git at icinga.org
Thu Apr 18 16:42:43 CEST 2013


Module: icinga-web
Branch: next
Commit: 2d3d31288b9914fed277ca56304be9e4750b1cb4
URL:    https://git.icinga.org/?p=icinga-web.git;a=commit;h=2d3d31288b9914fed277ca56304be9e4750b1cb4

Author: Marius Hein <marius.hein at netways.de>
Date:   Thu Apr 18 16:40:52 2013 +0200

make db-deinitialize starts db-initialize

Fixes wrong dispatching of make targets to phing targets. Problem
was a typo which called db-initialize on phing side which is
nonsense.

fixes #3521

---

 Makefile.in |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/Makefile.in b/Makefile.in
index df71d5b..8356dc3 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -67,7 +67,7 @@ none:
 	
 	@printf "\nDatabase (web) targets:\n"
 	@printf "\t%-22s - %s\n" "db-initialize" "create the db"
-	@printf "\t%-22s - %s\n" "db-deinitialize" "reverse the path (removes all data and drop the relations)"
+	@printf "\t%-22s - %s\n" "db-deinitialize" "DEPRECATED: Same as db-drop"
 	@printf "\t%-22s - %s\n" "db-drop" "drop the entire db"
 	@printf "\t%-22s - %s\n" "db-purge-userprefs" "purge existing user preferences"
 	@printf "\t%-22s - %s\n" "db-doc2sql" "export doctrine db schema"
@@ -272,8 +272,11 @@ upgrade-done:
 db-initialize:
 	$(PHING_CALL) db-initialize
 
+# -----------------------------------------------------------------------------
+# DEPRECATED TARGET, REMOVE ON 1.10
+# -----------------------------------------------------------------------------
 db-deinitialize:
-	$(PHING_CALL) db-initialize
+	$(PHING_CALL) db-deinitialize
 
 db-doc2sql:
 	${PHING_CALL} doc2sql





More information about the icinga-checkins mailing list