[Rt-commit] r7190 - rt/branches/3.7-EXPERIMENTAL-TUNIS/sbin

[ruz at bestpractical.com]

Author: ruz
Date: Wed Mar  7 20:06:16 2007
New Revision: 7190

Modified:
   rt/branches/3.7-EXPERIMENTAL-TUNIS/sbin/rt-setup-database.in

Log:
* don't ask for password if --force is used
* ask for password if it's not provided via option or env,
  even if prompt-for-dba-password is not used

Modified: rt/branches/3.7-EXPERIMENTAL-TUNIS/sbin/rt-setup-database.in
==============================================================================
--- rt/branches/3.7-EXPERIMENTAL-TUNIS/sbin/rt-setup-database.in	(original)
+++ rt/branches/3.7-EXPERIMENTAL-TUNIS/sbin/rt-setup-database.in	Wed Mar  7 20:06:16 2007
@@ -92,9 +92,9 @@
 my $db_pass = RT->Config->Get('DatabasePassword') || '';
 
 my $dba_user = $args{'dba'} || $ENV{'RT_DBA_USER'} || $db_user || '';
-my $dba_pass = $args{'dba-password'} || $ENV{'RT_DBA_PASSWORD'} || '';
+my $dba_pass = $args{'dba-password'} || $ENV{'RT_DBA_PASSWORD'};
 
-if ( $args{'prompt-for-dba-password'} ) {
+if ( !$args{force} || !defined $dba_pass || $args{'prompt-for-dba-password'} ) {
     $dba_pass = get_dba_password();
     chomp $dba_pass;
 }