#
#
# patch "lib/Monotone/AutomateStdio.pm"
#  from [b1aa3fb363117d6aaeed6bdbd9cbc5ae99080943]
#    to [004d8895d7ebd095ce99445e35057d857c9e3871]
#
============================================================
--- lib/Monotone/AutomateStdio.pm	b1aa3fb363117d6aaeed6bdbd9cbc5ae99080943
+++ lib/Monotone/AutomateStdio.pm	004d8895d7ebd095ce99445e35057d857c9e3871
@@ -4429,7 +4429,6 @@ sub mtn_read_output_format_1($$)
        $chunk_start,
        $cmd_nr,
        $colons,
-       $err,
        $err_code,
        $err_occurred,
        $handler,
@@ -4442,8 +4441,6 @@ sub mtn_read_output_format_1($$)
        $size);
     my $this = $class_records{$self->{$class_name}};
 
-    $err = $this->{mtn_err};
-
     # Work out what I/O wait handler is to be used.
 
     if (defined($this->{io_wait_handler}))
@@ -4499,13 +4496,13 @@ sub mtn_read_output_format_1($$)
 		    if ($char ne "m" && $char ne "l")
 		    {
 			croak("Corrupt/missing mtn chunk header, mtn gave:\n"
-			      . join("", <$err>));
+			      . join("", $this->{mtn_err}->getlines()));
 		    }
 		}
 		elsif ($char =~ m/\D$/)
 		{
 		    croak("Corrupt/missing mtn chunk header, mtn gave:\n"
-			  . join("", <$err>));
+			  . join("", $this->{mtn_err}->getlines()));
 		}
 	    }
 
@@ -4526,7 +4523,7 @@ sub mtn_read_output_format_1($$)
 	    else
 	    {
 		croak("Corrupt/missing mtn chunk header, mtn gave:\n"
-		      . join("", <$err>));
+		      . join("", $this->{mtn_err}->getlines()));
 	    }
 
 	    $chunk_start = undef;
@@ -4601,7 +4598,6 @@ sub mtn_read_output_format_2($$)
        $chunk_start,
        $cmd_nr,
        $colons,
-       $err,
        $err_code,
        $err_occurred,
        $handler,
@@ -4631,8 +4627,6 @@ sub mtn_read_output_format_2($$)
 		   w => {buffer_ref => undef,
 			 offset     => 0});
 
-    $err = $this->{mtn_err};
-
     # Create the buffers.
 
     foreach my $key (CORE::keys(%details))
@@ -4703,13 +4697,13 @@ sub mtn_read_output_format_2($$)
 		    if ($char !~ m/^[elmptw]$/)
 		    {
 			croak("Corrupt/missing mtn chunk header, mtn gave:\n"
-			      . join("", <$err>));
+			      . join("", $this->{mtn_err}->getlines()));
 		    }
 		}
 		elsif ($char =~ m/\D$/)
 		{
 		    croak("Corrupt/missing mtn chunk header, mtn gave:\n"
-			  . join("", <$err>));
+			  . join("", $this->{mtn_err}->getlines()));
 		}
 	    }
 
@@ -4726,7 +4720,7 @@ sub mtn_read_output_format_2($$)
 	    else
 	    {
 		croak("Corrupt/missing mtn chunk header, mtn gave:\n"
-		      . join("", <$err>));
+		      . join("", $this->{mtn_err}->getlines()));
 	    }
 
 	    # Set up the current buffer and offset details.