[Bps-public-commit] Module-Install-RTx branch, make-upgrade, created. 0.31-2-g6cbba90

[Kevin Falcone]

The branch, make-upgrade has been created
        at  6cbba90ad6deba8f3cf10b3ff4c2de97620cc76f (commit)

- Log -----------------------------------------------------------------
commit 0e78cb16a1630d96e3535f23aef1782cdbcb0ede
Author: Kevin Falcone <falcone at bestpractical.com>
Date:   Fri Jun 7 18:41:55 2013 -0400

    Use the new --product flag
    
    This tweaks the language when running extension database upgrades

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

commit 6cbba90ad6deba8f3cf10b3ff4c2de97620cc76f
Author: Kevin Falcone <falcone at bestpractical.com>
Date:   Fri Jun 7 18:43:50 2013 -0400

    Don't always hardcode etc/
    
    When running --action upgrade rt-setup-database wants to look in
    etc/upgrade and this would prevent that.

diff --git a/lib/Module/Install/RTx/Factory.pm b/lib/Module/Install/RTx/Factory.pm
index aea06d5..c0dd14b 100644
--- a/lib/Module/Install/RTx/Factory.pm
+++ b/lib/Module/Install/RTx/Factory.pm
@@ -31,7 +31,7 @@ sub RTxInitDB {
         "-I$lib_path",
         "$RT::SbinPath/rt-setup-database",
         "--action"      => $action,
-        "--datadir"     => "etc",
+        ($action eq 'upgrade' ? () : ("--datadir"     => "etc")),
         (($action eq 'insert') ? ("--datafile"    => "etc/initialdata") : ()),
         "--dba"         => $RT::DatabaseAdmin || $RT::DatabaseUser,
         "--prompt-for-dba-password" => '',

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