[Bps-public-commit] Module-Install-RTx branch, master, updated. 0.30-1-gb1f4f0f

[Alex Vandiver]

The branch, master has been updated
       via  b1f4f0f8b4a6d0c1fbce981bbc08e66f871c41c7 (commit)
      from  844fdc15d4a07e04b314c53589a2f5a3cc2b5615 (commit)

Summary of changes:
 lib/Module/Install/RTx/Factory.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

- Log -----------------------------------------------------------------
commit b1f4f0f8b4a6d0c1fbce981bbc08e66f871c41c7
Author: Alex Vandiver <alexmv at bestpractical.com>
Date:   Thu Dec 20 16:43:51 2012 -0500

    Use the stored DBA username, if possible

diff --git a/lib/Module/Install/RTx/Factory.pm b/lib/Module/Install/RTx/Factory.pm
index 5a3fdea..094a055 100644
--- a/lib/Module/Install/RTx/Factory.pm
+++ b/lib/Module/Install/RTx/Factory.pm
@@ -33,7 +33,7 @@ sub RTxInitDB {
         "--action"      => $action,
         "--datadir"     => "etc",
         (($action eq 'insert') ? ("--datafile"    => "etc/initialdata") : ()),
-        "--dba"         => $RT::DatabaseUser,
+        "--dba"         => $RT::DatabaseAdmin || $RT::DatabaseUser,
         "--prompt-for-dba-password" => '',
         (RT::System->can('AddUpgradeHistory') ? ("--package" => $name, "--ext-version" => $version) : ()),
     );

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