[Bps-public-commit] RTx-TakeScreenshots branch, master, updated. 76acca6ab21c2b171446d4d0aef60b8cc82aec01

[Thomas Sibley]

The branch, master has been updated
       via  76acca6ab21c2b171446d4d0aef60b8cc82aec01 (commit)
       via  4128c1722fa377bdcac97afe0eb1cd0942058d5e (commit)
      from  a96e52dfe157c56ca9d6b0bd8afa0ee95fc1334b (commit)

Summary of changes:
 bin/clean-slate           |    6 +++++-
 inc/Module/Install/RTx.pm |    6 +++---
 2 files changed, 8 insertions(+), 4 deletions(-)

- Log -----------------------------------------------------------------
commit 4128c1722fa377bdcac97afe0eb1cd0942058d5e
Author: Thomas Sibley <trs at bestpractical.com>
Date:   Wed Mar 16 16:33:24 2011 -0400

    Cleaner way to reset the RT database

diff --git a/bin/clean-slate b/bin/clean-slate
index 616e211..1d3d52e 100755
--- a/bin/clean-slate
+++ b/bin/clean-slate
@@ -1,7 +1,11 @@
 #!/bin/sh
 EXT=`pwd`
 RT=${RTHOME:-~/bps/rt}
+
 cd $RT
-echo -ne "\ny\n" | make dropdb && echo -ne "\n" | make initdb
+# Imitate make regression-reset-db
+./sbin/rt-setup-database --action drop --force
+./sbin/rt-setup-database --action init
+
 cd $EXT
 echo -ne "\n" | make initdb

commit 76acca6ab21c2b171446d4d0aef60b8cc82aec01
Author: Thomas Sibley <trs at bestpractical.com>
Date:   Wed Mar 16 16:33:37 2011 -0400

    Update M::I::RTx to 0.28
    
    It detects /opt/rt4 install paths.

diff --git a/inc/Module/Install/RTx.pm b/inc/Module/Install/RTx.pm
index f027f78..726b3fb 100644
--- a/inc/Module/Install/RTx.pm
+++ b/inc/Module/Install/RTx.pm
@@ -8,7 +8,7 @@ no warnings 'once';
 
 use Module::Install::Base;
 use base 'Module::Install::Base';
-our $VERSION = '0.27';
+our $VERSION = '0.28';
 
 use FindBin;
 use File::Glob     ();
@@ -44,8 +44,8 @@ sub RTx {
         local @INC = (
             $ENV{RTHOME} ? ( $ENV{RTHOME}, "$ENV{RTHOME}/lib" ) : (),
             @INC,
-            map { ( "$_/rt3/lib", "$_/lib/rt3", "$_/lib" ) } grep $_,
-            @prefixes
+            map { ( "$_/rt4/lib", "$_/lib/rt4", "$_/rt3/lib", "$_/lib/rt3", "$_/lib" ) 
+                } grep $_, @prefixes
         );
         until ( eval { require RT; $RT::LocalPath } ) {
             warn

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