[Rt-commit] rt branch, 4.4.0-releng, updated. rt-4.2.12-506-g5cb67b2

[Shawn Moore]

The branch, 4.4.0-releng has been updated
       via  5cb67b278dc59b4161f0e5190e80b3d45c636a21 (commit)
      from  dea515e69b6925be255c210e3f86694e14d43409 (commit)

Summary of changes:
 sbin/rt-setup-database.in | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

- Log -----------------------------------------------------------------
commit 5cb67b278dc59b4161f0e5190e80b3d45c636a21
Author: Shawn M Moore <shawn at bestpractical.com>
Date:   Tue Nov 3 16:29:10 2015 +0000

    Avoid using a stale dbh in rt-setup-database

diff --git a/sbin/rt-setup-database.in b/sbin/rt-setup-database.in
index 2b8a49b..d8e4fb2 100644
--- a/sbin/rt-setup-database.in
+++ b/sbin/rt-setup-database.in
@@ -353,7 +353,10 @@ sub action_insert {
     my %args = @_;
     unless ($RAN_INIT) {
         $RT::Handle = RT::Handle->new;
-        my $has_custom_roles = grep { lc($_) eq 'customroles' } $RT::Handle->_TableNames;
+
+        my $dbh = get_admin_dbh();
+        my $has_custom_roles = grep { lc($_) eq 'customroles' } $RT::Handle->_TableNames($dbh);
+
         RT::Init(SkipCustomRoles => !$has_custom_roles);
         $RAN_INIT++;
     }

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