[Rt-commit] rt branch, 4.2-trunk, updated. rt-4.2.10-239-gf47e91e

[Alex Vandiver]

The branch, 4.2-trunk has been updated
       via  f47e91e62f9b34324cea4cfe7bcb8c860370a85f (commit)
       via  4211f4b0fd0fec7fed0cd4385fdff49695d18b9f (commit)
      from  605a5fc6a04103cb22aee7b094d8680e094c75d2 (commit)

Summary of changes:
 lib/RT/Test.pm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

- Log -----------------------------------------------------------------
commit 4211f4b0fd0fec7fed0cd4385fdff49695d18b9f
Author: Dominic Hargreaves <dom at earth.li>
Date:   Mon May 4 19:52:56 2015 +0100

    Pass a scalar to File::Which::which rather than a list
    
    File::Which 1.17 introduced a scalar prototype for the which() sub,
    which broke the previous use of this in RT::Test. See
    <https://github.com/plicease/File-Which/issues/6>.

diff --git a/lib/RT/Test.pm b/lib/RT/Test.pm
index 6afb311..11cecad 100644
--- a/lib/RT/Test.pm
+++ b/lib/RT/Test.pm
@@ -1718,9 +1718,9 @@ sub file_content {
 }
 
 sub find_executable {
-    my $self = shift;
+    my ( $self, $exe ) = @_;
 
-    return File::Which::which( @_ );
+    return File::Which::which( $exe );
 }
 
 sub diag {

commit f47e91e62f9b34324cea4cfe7bcb8c860370a85f
Merge: 605a5fc 4211f4b
Author: Alex Vandiver <alexmv at bestpractical.com>
Date:   Mon May 4 17:23:49 2015 -0400

    Merge branch '4.2/file-which-fix' into 4.2-trunk


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