Fix propigation of failure from pre and post hooks and from fixups.

diff --git a/debian/changelog b/debian/changelog
index 2d26a54ff06d7d579c865d2cef3f1f33806deeb1..5e4cb7b13132443e0f920592f1280e89da2b30c9 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+mr (1.06) UNRELEASED; urgency=low
+
+  * Fix propigation of failure from pre and post hooks and from fixups.
+
+ -- Joey Hess <joeyh@debian.org>  Thu, 27 Oct 2011 12:18:43 -0400
+
 mr (1.05) unstable; urgency=low
 
   * README now gives a quick into to using mr.

diff --git a/mr b/mr
index 61e21024919d2911181c015b0df76f083a7ef94f..74b1cfc094e963bd150890061f1181b61850efe6 100755 (executable)
--- a/mr
+++ b/mr
@@ -755,6 +755,9 @@ sub hook {
                        print STDERR "mr $hook: received signal ".($? & 127)."\n";
                        return ABORT;
                }
+               else {
+                       return FAILED;
+               }
        }
 
        return OK;