[Rt-commit] rt branch, 4.0.1-releng, updated. rt-4.0.1rc1-18-g8e891d4

[Kevin Falcone]

The branch, 4.0.1-releng has been updated
       via  8e891d496e174b571fac4896ea5d485c25edc32f (commit)
       via  323822d30559debd0c6d0abb0d97c382ee41f46b (commit)
       via  09dfe4c8b1ea2c5cc245a73d191445a53bbe72ad (commit)
       via  0f3ecfaf0e3cfe5aac030aed5efb56bbee61c72c (commit)
       via  6c6ef5e596ee87e5a31d2256ee682d55dad93ca5 (commit)
       via  2370ad8c83696fb51a54adff665c4cf947b44e49 (commit)
       via  8b2a1742b0325329a516dc7c8126f77b7d59551f (commit)
       via  da3122a58e0549b0cef8308ed8fddeaf8781bc72 (commit)
      from  a7f579a2640b1bcc9ca2f28730713a8e29a8cda1 (commit)

Summary of changes:
 Makefile.in               |   10 +++++-----
 README                    |   14 +++++++++-----
 lib/RT/Config.pm          |   27 +++++++++++++++++++++++++++
 sbin/rt-setup-database.in |    4 +++-
 4 files changed, 44 insertions(+), 11 deletions(-)

- Log -----------------------------------------------------------------
commit 2370ad8c83696fb51a54adff665c4cf947b44e49
Author: Alex Vandiver <alexmv at bestpractical.com>
Date:   Mon Jun 6 14:36:03 2011 -0400

    Default to the configure-time DBA in rt-setup-database

diff --git a/sbin/rt-setup-database.in b/sbin/rt-setup-database.in
index f7ef0a0..1c5b1e8 100755
--- a/sbin/rt-setup-database.in
+++ b/sbin/rt-setup-database.in
@@ -81,7 +81,9 @@ use Getopt::Long;
 
 $| = 1; # unbuffer all output.
 
-my %args;
+my %args = (
+    dba => '@DB_DBA@',
+);
 GetOptions(
     \%args,
     'action=s',

commit 6c6ef5e596ee87e5a31d2256ee682d55dad93ca5
Author: Alex Vandiver <alexmv at bestpractical.com>
Date:   Mon Jun 6 14:38:18 2011 -0400

    Remove places where we now un-necessarily specify --dba

diff --git a/Makefile.in b/Makefile.in
index ce36e75..5c69bda 100755
--- a/Makefile.in
+++ b/Makefile.in
@@ -252,7 +252,7 @@ upgrade-instruct:
 	@echo "Congratulations. RT has been upgraded. You should now check over"
 	@echo "$(CONFIG_FILE) for any necessary site customization. Additionally,"
 	@echo "you should update RT's system database objects by running "
-	@echo "    $(RT_SBIN_PATH)/rt-setup-database --dba $(DB_DBA) --prompt-for-dba-password --action upgrade"
+	@echo "    $(RT_SBIN_PATH)/rt-setup-database --prompt-for-dba-password --action upgrade"
 
 
 upgrade: testdeps config-install dirs files-install fixperms upgrade-instruct
@@ -353,18 +353,18 @@ test-parallel:
 	RT_TEST_PARALLEL=1 $(PERL) "-MApp::Prove" -e 'my $$p = App::Prove->new(); $$p->process_args("-lrj5","--state=slow,save", "t"); $$p->run()'
 
 regression-reset-db: force-dropdb
-	$(PERL) -I$(LOCAL_LIB_PATH) -I$(RT_LIB_PATH) sbin/rt-setup-database --action init --dba $(DB_DBA) --dba-password ''
+	$(PERL) -I$(LOCAL_LIB_PATH) -I$(RT_LIB_PATH) sbin/rt-setup-database --action init --dba-password ''
 
 initdb :: initialize-database
 
 initialize-database: 
-	$(PERL) -I$(LOCAL_LIB_PATH) -I$(RT_LIB_PATH) sbin/rt-setup-database --action init --dba $(DB_DBA) --prompt-for-dba-password
+	$(PERL) -I$(LOCAL_LIB_PATH) -I$(RT_LIB_PATH) sbin/rt-setup-database --action init --prompt-for-dba-password
 
 dropdb: 
-	$(PERL) -I$(LOCAL_LIB_PATH) -I$(RT_LIB_PATH) sbin/rt-setup-database --action drop --dba $(DB_DBA) --prompt-for-dba-password
+	$(PERL) -I$(LOCAL_LIB_PATH) -I$(RT_LIB_PATH) sbin/rt-setup-database --action drop --prompt-for-dba-password
 
 force-dropdb: 
-	$(PERL) -I$(LOCAL_LIB_PATH) -I$(RT_LIB_PATH) sbin/rt-setup-database --action drop --dba $(DB_DBA) --dba-password '' --force
+	$(PERL) -I$(LOCAL_LIB_PATH) -I$(RT_LIB_PATH) sbin/rt-setup-database --action drop --dba-password '' --force
 
 critic:
 	perlcritic --quiet sbin bin lib

commit 0f3ecfaf0e3cfe5aac030aed5efb56bbee61c72c
Author: Alex Vandiver <alexmv at bestpractical.com>
Date:   Mon Jun 6 14:26:26 2011 -0400

    Make the database upgrade command be explicit

diff --git a/README b/README
index f4f847c..ad959f2 100644
--- a/README
+++ b/README
@@ -160,11 +160,15 @@ GENERAL INSTALLATION
 
           make upgrade
 
-      This will also display the appropriate rt-setup-database command to
-      upgrade your database.  You should back up your database before
-      running this command.  When you run it, you will be prompted for
-      your previous version of RT (such as 3.6.4) so that the appropriate
-      set of database upgrades can be applied.
+      This will also prompt you to upgrade your database by running:
+
+          /opt/rt4/sbin/rt-setup-database \
+              --prompt-for-dba-password --action upgrade
+
+      You should back up your database before running this command.
+      When you run it, you will be prompted for your previous version of
+      RT (such as 3.6.4) so that the appropriate set of database
+      upgrades can be applied.
 
       Finally, clear the Mason cache dir:
 

commit 09dfe4c8b1ea2c5cc245a73d191445a53bbe72ad
Merge: a7f579a 0f3ecfa
Author: Kevin Falcone <falcone at bestpractical.com>
Date:   Wed Jun 8 12:22:56 2011 -0400

    Merge branch '4.0/default-setup-database-to-dba' into 4.0.1-releng


commit 8e891d496e174b571fac4896ea5d485c25edc32f
Merge: 09dfe4c 323822d
Author: Kevin Falcone <falcone at bestpractical.com>
Date:   Wed Jun 8 13:55:46 2011 -0400

    Merge branch '4.0/warn-active-status' into 4.0.1-releng


-----------------------------------------------------------------------