Fix breakage introduced by --minimal patch.

[code/myrepos.git] / mr

diff --git a/mr b/mr
index 87acef39b279cf4d119f35912ebc8967a7cf524c..d8a27b288cc36081665e9463ac1d626c41659368 100755 (executable)
--- a/mr
+++ b/mr
@@ -586,7 +586,7 @@ my $no_chdir=0;
 my $jobs=1;
 my $trust_all=0;
 my $directory=getcwd();
 my $jobs=1;
 my $trust_all=0;
 my $directory=getcwd();

-my $terminal=-t STDOUT && eval{require IO::Pty::Easy;IO::Pty::Easy->import();1;} eq 1;
+my $terminal=-t STDOUT && eval{require IO::Pty::Easy;IO::Pty::Easy->import();1;};

 
 my $HOME_MR_CONFIG = "$ENV{HOME}/.mrconfig";
 $ENV{MR_CONFIG}=find_mrconfig();
 
 my $HOME_MR_CONFIG = "$ENV{HOME}/.mrconfig";
 $ENV{MR_CONFIG}=find_mrconfig();


@@ -853,7 +853,7 @@ sub action {
                }
                print "$actionmsg\n" unless $quiet || $minimal;
 
                }
                print "$actionmsg\n" unless $quiet || $minimal;
 

-               my $hookret=hook("pre_$action", $topdir, $subdir);
+               my ($hookret, $hook_out)=hook("pre_$action", $topdir, $subdir);

                return $hookret if $hookret != OK;
 
                my ($ret, $out)=runsh $action, $topdir, $subdir,
                return $hookret if $hookret != OK;
 
                my ($ret, $out)=runsh $action, $topdir, $subdir,


@@ -908,7 +908,7 @@ sub action {
                                                return FAILED;
                                        }
                                }
                                                return FAILED;
                                        }
                                }

-                               my $ret=hook("fixups", $topdir, $subdir);
+                               my ($ret, $hook_out)=hook("fixups", $topdir, $subdir);

                                return $ret if $ret != OK;
                        }
                        
                                return $ret if $ret != OK;
                        }