[svn:parrot] r17931 - trunk/lib/Parrot/Configure

[paultcochrane]

Author: paultcochrane
Date: Sun Apr  1 10:26:10 2007
New Revision: 17931

Modified:
   trunk/lib/Parrot/Configure/Step.pm

Log:
[lib] Undoing some two-arg-open to three-arg-open changes I made a while ago
as they cause problems with perl 5.6.1


Modified: trunk/lib/Parrot/Configure/Step.pm
==============================================================================
--- trunk/lib/Parrot/Configure/Step.pm  (original)
+++ trunk/lib/Parrot/Configure/Step.pm  Sun Apr  1 10:26:10 2007
@@ -434,8 +434,8 @@
     local *OLDERR if $err;
 
     # Save the old filehandles; we must not let them get closed.
-    open OLDOUT, ">&", "STDOUT" or die "Can't save     stdout" if $out;
-    open OLDERR, ">&", "STDERR" or die "Can't save     stderr" if $err;
+    open OLDOUT, ">&STDOUT" or die "Can't save     stdout" if $out;
+    open OLDERR, ">&STDERR" or die "Can't save     stderr" if $err;
 
     open STDOUT, ">", "$out" or die "Can't redirect stdout" if $out;
     open STDERR, ">$err" or die "Can't redirect stderr" if $err;
@@ -446,8 +446,8 @@
     close STDOUT or die "Can't close    stdout" if $out;
     close STDERR or die "Can't close    stderr" if $err;
 
-    open STDOUT, ">&", "OLDOUT" or die "Can't restore  stdout" if $out;
-    open STDERR, ">&", "OLDERR" or die "Can't restore  stderr" if $err;
+    open STDOUT, ">&OLDOUT" or die "Can't restore  stdout" if $out;
+    open STDERR, ">&OLDERR" or die "Can't restore  stderr" if $err;
 
     if ($verbose) {
         foreach ( $out, $err ) {
@@ -581,7 +581,7 @@
     my $command = join ' ', @_;
 
     # disable STDERR
-    open OLDERR, ">&", "STDERR";
+    open OLDERR, ">&STDERR";
     open STDERR, ">", "test.err";
 
     my $output = `$command`;
@@ -589,7 +589,7 @@
 
     # reenable STDERR
     close STDERR;
-    open STDERR, ">&", "OLDERR";
+    open STDERR, ">&OLDERR";
 
     # slurp stderr
     my $out_err = _slurp('./test.err');