Fix breakage introduced by --minimal patch.

diff --git a/debian/changelog b/debian/changelog
index 4634b808e686121e92eab08721af3946dc15fa1f..4e6d8783735113c5194d02a6a05af8c75daac07f 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+myrepos (1.20140831.1) unstable; urgency=medium
+
+  * Fix breakage introduced by --minimal patch.
+
+ -- Joey Hess <joeyh@debian.org>  Sun, 31 Aug 2014 14:05:56 -0700
+

 myrepos (1.20140831) unstable; urgency=medium
 
   * Deal with abs_path change in new version of perl, now it returns undefined
 myrepos (1.20140831) unstable; urgency=medium
 
   * Deal with abs_path change in new version of perl, now it returns undefined

diff --git a/mr b/mr
index 98e080c2f4f932cb6f52879a8d4be060c52bba99..d8a27b288cc36081665e9463ac1d626c41659368 100755 (executable)
--- a/mr
+++ b/mr
@@ -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;
                        }