From 2a044e2dcc3efcaa6ba8f0d7b6f8bc68f13ee3a3 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sun, 31 Aug 2014 14:06:03 -0700 Subject: [PATCH 1/1] Fix breakage introduced by --minimal patch. --- debian/changelog | 6 ++++++ mr | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) 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 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; } -- 2.39.5