[Rt-commit] rt branch, 4.0-trunk, updated. rt-4.0.13-60-g2a6a737

[Thomas Sibley]

The branch, 4.0-trunk has been updated
       via  2a6a7377a7d571c19f5cfec72e9f3e85ba253cdd (commit)
       via  e13d8bf9ca44bcbb99d6b57bba55782f55785970 (commit)
      from  327de24f9ef34fd87ae9cf4be0ada7be113c774d (commit)

Summary of changes:
 lib/RT/Pod/HTML.pm        | 4 ++--
 sbin/rt-setup-database.in | 7 ++++---
 2 files changed, 6 insertions(+), 5 deletions(-)

- Log -----------------------------------------------------------------
commit e13d8bf9ca44bcbb99d6b57bba55782f55785970
Author: Thomas Sibley <trs at bestpractical.com>
Date:   Mon Jun 10 12:53:52 2013 -0700

    "RT" and "rt" are valid local links when generating documentation

diff --git a/lib/RT/Pod/HTML.pm b/lib/RT/Pod/HTML.pm
index 6896063..d220509 100644
--- a/lib/RT/Pod/HTML.pm
+++ b/lib/RT/Pod/HTML.pm
@@ -123,12 +123,12 @@ sub resolve_local_link {
         : '';
 
     my $local;
-    if ($name =~ /^RT::/) {
+    if ($name =~ /^RT(::|$)/) {
         $local = join "/",
                   map { $self->encode_entities($_) }
                 split /::/, $name;
     }
-    elsif ($name =~ /^rt[-_]/) {
+    elsif ($name =~ /^rt([-_]|$)/) {
         $local = $self->encode_entities($name);
     }
     elsif ($name eq "RT_Config" or $name eq "RT_Config.pm") {

commit 2a6a7377a7d571c19f5cfec72e9f3e85ba253cdd
Author: Dominic Hargreaves <dom at earth.li>
Date:   Sun Jun 2 14:03:17 2013 +0100

    Print DatabasePort as well as DatabaseHost in rt-setup-database
    
    Signed-off-by: Thomas Sibley <trs at bestpractical.com>

diff --git a/sbin/rt-setup-database.in b/sbin/rt-setup-database.in
index f4beb2c..ddb286b 100644
--- a/sbin/rt-setup-database.in
+++ b/sbin/rt-setup-database.in
@@ -164,6 +164,7 @@ foreach my $key(qw(Type Host Name User Password)) {
 
 my $db_type = RT->Config->Get('DatabaseType') || '';
 my $db_host = RT->Config->Get('DatabaseHost') || '';
+my $db_port = RT->Config->Get('DatabasePort') || '';
 my $db_name = RT->Config->Get('DatabaseName') || '';
 my $db_user = RT->Config->Get('DatabaseUser') || '';
 my $db_pass = RT->Config->Get('DatabasePassword') || '';
@@ -190,7 +191,7 @@ if ($args{'skip-create'}) {
 }
 
 print "Working with:\n"
-    ."Type:\t$db_type\nHost:\t$db_host\nName:\t$db_name\n"
+    ."Type:\t$db_type\nHost:\t$db_host\nPort:\t$db_port\nName:\t$db_name\n"
     ."User:\t$db_user\nDBA:\t$dba_user" . ($args{'skip-create'} ? ' (No DBA)' : '') . "\n";
 
 foreach my $action ( @actions ) {
@@ -218,7 +219,7 @@ sub action_drop {
     unless ( $args{'force'} ) {
         print <<END;
 
-About to drop $db_type database $db_name on $db_host.
+About to drop $db_type database $db_name on $db_host (port '$db_port').
 WARNING: This will erase all data in $db_name.
 
 END
@@ -427,7 +428,7 @@ sub error {
 sub get_dba_password {
     print "In order to create or update your RT database,"
         . " this script needs to connect to your "
-        . " $db_type instance on $db_host as $dba_user\n";
+        . " $db_type instance on $db_host (port '$db_port') as $dba_user\n";
     print "Please specify that user's database password below. If the user has no database\n";
     print "password, just press return.\n\n";
     print "Password: ";

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