[Bps-public-commit] r15351 - in Shipwright/trunk: .

[sunnavy at bestpractical.com]

Author: sunnavy
Date: Thu Aug 21 22:04:33 2008
New Revision: 15351

Modified:
   Shipwright/trunk/   (props changed)
   Shipwright/trunk/lib/Shipwright/Test.pm

Log:
 r15955 at sunnavys-mb:  sunnavy | 2008-08-22 10:04:22 +0800
 in case of people have weird svk or svn


Modified: Shipwright/trunk/lib/Shipwright/Test.pm
==============================================================================
--- Shipwright/trunk/lib/Shipwright/Test.pm	(original)
+++ Shipwright/trunk/lib/Shipwright/Test.pm	Thu Aug 21 22:04:33 2008
@@ -29,8 +29,8 @@
 
 sub has_svk {
     if ( can_run('svk') && can_run('svnadmin') ) {
-        my $out = Shipwright::Util->run(['svk', '--version']);
-        if ( $out =~ /version v(\d)\./i ) {
+        my $out = Shipwright::Util->run(['svk', '--version'], 1);
+        if ( $out && $out =~ /version v(\d)\./i ) {
             return 1 if $1 >= 2;
         }
     }
@@ -46,8 +46,8 @@
 
 sub has_svn {
     if ( can_run('svn') && can_run('svnadmin') ) {
-        my $out = Shipwright::Util->run(['svn', '--version']);
-        if ( $out =~ /version 1\.(\d)/i ) {
+        my $out = Shipwright::Util->run(['svn', '--version'], 1);
+        if ( $out && $out =~ /version 1\.(\d)/i ) {
             return 1 if $1 >= 4;
         }
     }