[debhelper-devel] [debhelper] 01/03: Dh_Lib: Make "exit 1" the default value for ERROR_HANDLER

[Niels Thykier]

This is an automated email from the git hooks/post-receive script.

nthykier pushed a commit to branch master
in repository debhelper.

commit 60d7eff8a46cdc62776cc3c25fadf98fcb504667
Author: Niels Thykier <niels at thykier.net>
Date:   Sun Dec 31 21:03:31 2017 +0000

    Dh_Lib: Make "exit 1" the default value for ERROR_HANDLER
    
    Signed-off-by: Niels Thykier <niels at thykier.net>
---
 debian/changelog               | 3 +++
 lib/Debian/Debhelper/Dh_Lib.pm | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 550d43a..6ec3bf6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -36,6 +36,9 @@ debhelper (11.1) UNRELEASED; urgency=medium
     the first (functional) version with support for
     "defaults-disabled".  Thanks to Laurent Bigonville for the
     report and Evgeni Golov for filing #857452.  (Closes: #709384)
+  * Dh_Lib.pm: Make "exit 1" the default error-handler instead of
+    "exit $?" as this makes it easier to migrate from sed-based
+    autoscript substitutions to the new hash-based ones.
 
  -- Niels Thykier <niels at thykier.net>  Sun, 17 Dec 2017 07:59:18 +0000
 
diff --git a/lib/Debian/Debhelper/Dh_Lib.pm b/lib/Debian/Debhelper/Dh_Lib.pm
index 17bbe1b..eded957 100644
--- a/lib/Debian/Debhelper/Dh_Lib.pm
+++ b/lib/Debian/Debhelper/Dh_Lib.pm
@@ -184,7 +184,7 @@ sub init {
 	# If no error handling function was specified, just propagate
 	# errors out.
 	if (! exists $dh{ERROR_HANDLER} || ! defined $dh{ERROR_HANDLER}) {
-		$dh{ERROR_HANDLER}='exit \$?';
+		$dh{ERROR_HANDLER}='exit 1';
 	}
 
 	$dh{U_PARAMS} //= [];

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debhelper/debhelper.git