diff options
author | Niels Thykier <niels@thykier.net> | 2017-12-31 21:03:31 +0000 |
---|---|---|
committer | Niels Thykier <niels@thykier.net> | 2017-12-31 21:03:31 +0000 |
commit | 60d7eff8a46cdc62776cc3c25fadf98fcb504667 (patch) | |
tree | 5f7c49000153e2cd840300d3a1a926bc9fe1d966 | |
parent | dc13d672b97894ccffc150b263e5c3b88da0c183 (diff) | |
download | debhelper-60d7eff8a46cdc62776cc3c25fadf98fcb504667.tar.gz |
Dh_Lib: Make "exit 1" the default value for ERROR_HANDLER
Signed-off-by: Niels Thykier <niels@thykier.net>
-rw-r--r-- | debian/changelog | 3 | ||||
-rw-r--r-- | lib/Debian/Debhelper/Dh_Lib.pm | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog index 550d43a7..6ec3bf69 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@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 17bbe1bb..eded9573 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} //= []; |