From: Joey Hess <joey@kitenet.net>
Date: Sun, 31 Aug 2014 21:06:03 +0000 (-0700)
Subject: Fix breakage introduced by --minimal patch.
X-Git-Url: https://git.madduck.net/code/myrepos.git/commitdiff_plain/2a044e2dcc3efcaa6ba8f0d7b6f8bc68f13ee3a3?hp=68c9ac23f6812644cafcd88cbdc8f9dfdcdc73df

Fix breakage introduced by --minimal patch.
---

diff --git a/debian/changelog b/debian/changelog
index 4634b80..4e6d878 100644
--- 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
diff --git a/mr b/mr
index 98e080c..d8a27b2 100755
--- a/mr
+++ b/mr
@@ -853,7 +853,7 @@ sub action {
 		}
 		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,
@@ -908,7 +908,7 @@ sub action {
 						return FAILED;
 					}
 				}
-				my $ret=hook("fixups", $topdir, $subdir);
+				my ($ret, $hook_out)=hook("fixups", $topdir, $subdir);
 				return $ret if $ret != OK;
 			}