From: Chris Williams <chris@bingosnet.co.uk>
Date: Sun, 15 Nov 2009 22:08:12 +0000 (+0000)
Subject: Update IPC::Cmd to cpan version 0.54
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=ccbe4e7464622f4935b162dd08db9d73acfed504;p=p5sagit%2Fp5-mst-13.2.git

Update IPC::Cmd to cpan version 0.54

  Changes for 0.54    Sun Nov 15 21:43:51 GMT 2009
  =================================================
  * Fixed issues on older perls requiring Time::HiRes
---

diff --git a/Porting/Maintainers.pl b/Porting/Maintainers.pl
index de8c33c..82cd7e8 100755
--- a/Porting/Maintainers.pl
+++ b/Porting/Maintainers.pl
@@ -812,7 +812,7 @@ use File::Glob qw(:case);
     'IPC::Cmd' =>
 	{
 	'MAINTAINER'	=> 'kane',
-	'DISTRIBUTION'	=> 'BINGOS/IPC-Cmd-0.52.tar.gz',
+	'DISTRIBUTION'	=> 'BINGOS/IPC-Cmd-0.54.tar.gz',
 	'FILES'		=> q[cpan/IPC-Cmd],
 	'CPAN'		=> 1,
 	'UPSTREAM'	=> 'cpan',
diff --git a/cpan/IPC-Cmd/lib/IPC/Cmd.pm b/cpan/IPC-Cmd/lib/IPC/Cmd.pm
index b9a2326..e60c93f 100644
--- a/cpan/IPC-Cmd/lib/IPC/Cmd.pm
+++ b/cpan/IPC-Cmd/lib/IPC/Cmd.pm
@@ -16,7 +16,7 @@ BEGIN {
                         $USE_IPC_RUN $USE_IPC_OPEN3 $CAN_USE_RUN_FORKED $WARN
                     ];
 
-    $VERSION        = '0.52';
+    $VERSION        = '0.54';
     $VERBOSE        = 0;
     $DEBUG          = 0;
     $WARN           = 1;
@@ -29,9 +29,9 @@ BEGIN {
         require IPC::Open3; IPC::Open3->import();
         require IO::Select; IO::Select->import();
         require IO::Handle; IO::Handle->import();
-        require Time::HiRes; Time::HiRes->import();
         require FileHandle; FileHandle->import();
         require Socket; Socket->import();
+        require Time::HiRes; Time::HiRes->import();
     };
     $CAN_USE_RUN_FORKED = $@ || !IS_VMS && !IS_WIN32;
 
@@ -358,7 +358,7 @@ sub kill_gently {
     }
 
     $wait_cycles = $wait_cycles + 1;
-    usleep(250000); # half a second
+    Time::HiRes::usleep(250000); # half a second
   }
 }
 
@@ -457,7 +457,7 @@ sub open3_run {
       }
     }
 
-    usleep(1);
+    Time::HiRes::usleep(1);
 
     foreach my $fd ($select->can_read(1/100)) {
       my $str = $child_output->{$fd->fileno};
@@ -604,7 +604,6 @@ sub run_forked {
         Carp::carp("run_forked is not available: $CAN_USE_RUN_FORKED");
         return;
     }
-    use Time::HiRes qw/usleep/;
 
     my ($cmd, $opts) = @_;
 
@@ -746,7 +745,7 @@ sub run_forked {
           }
         }
 
-        usleep(1);
+        Time::HiRes::usleep(1);
       }
 
       # $child_pid_pid is not defined in two cases: