diff options
Diffstat (limited to 'rt/sbin/rt-setup-database.in')
| -rw-r--r-- | rt/sbin/rt-setup-database.in | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/rt/sbin/rt-setup-database.in b/rt/sbin/rt-setup-database.in index 2817ba35c..d157a6b04 100644 --- a/rt/sbin/rt-setup-database.in +++ b/rt/sbin/rt-setup-database.in @@ -150,7 +150,9 @@ if ( $db_type eq 'SQLite' && !File::Spec->file_name_is_absolute($db_name) ) { } my $dba_user = $args{'dba'} || $ENV{'RT_DBA_USER'} || $db_user || ''; -my $dba_pass = $args{'dba-password'} || $ENV{'RT_DBA_PASSWORD'}; +my $dba_pass = exists($args{'dba-password'}) + ? $args{'dba-password'} + : $ENV{'RT_DBA_PASSWORD'}; if ( !$args{force} && ( !defined $dba_pass || $args{'prompt-for-dba-password'} ) ) { $dba_pass = get_dba_password(); @@ -339,7 +341,7 @@ sub action_upgrade { sub get_versions_from_to { my ($base_dir, $from, $to) = @_; - opendir( my $dh, $base_dir ) or die "couldn't open dir: $!"; + opendir my $dh, $base_dir or die "couldn't open dir: $!"; my @versions = grep -d "$base_dir/$_" && /\d+\.\d+\.\d+/, readdir $dh; closedir $dh; |