[Rt-commit] r13380 - rt/3.8/trunk/lib/RT

[sunnavy at bestpractical.com]

Author: sunnavy
Date: Wed Jun 18 08:44:46 2008
New Revision: 13380

Modified:
   rt/3.8/trunk/lib/RT/Installer.pm

Log:
save undef settings too

Modified: rt/3.8/trunk/lib/RT/Installer.pm
==============================================================================
--- rt/3.8/trunk/lib/RT/Installer.pm	(original)
+++ rt/3.8/trunk/lib/RT/Installer.pm	Wed Jun 18 08:44:46 2008
@@ -121,7 +121,6 @@
             Description =>
               'Database password for RT',    #loc
             Type => 'password',
-            Hints => 'default is rt_pass',
         },
     },
     DatabaseRequireSSL => {
@@ -287,12 +286,13 @@
             # we don't want to store root's password in config.
             next if $_ eq 'Password';
 
-            if (defined $RT::Installer->{InstallConfig}{$_}) {
-                # remove obsolete settings we'll add later
-                $content =~ s/^\s* Set \s* \( \s* \$$_ .*$//xm;
+            $RT::Installer->{InstallConfig}{$_} = '' unless defined
+                $RT::Installer->{InstallConfig}{$_};
 
-                $content .= "Set( \$$_, '$RT::Installer->{InstallConfig}{$_}' );\n";
-            }
+            # remove obsolete settings we'll add later
+            $content =~ s/^\s* Set \s* \( \s* \$$_ .*$//xm;
+
+            $content .= "Set( \$$_, '$RT::Installer->{InstallConfig}{$_}' );\n";
         }
         $content .= "1;\n";
         print $fh $content;