From b2576526b99a3dd484f33782c5f20d9d42db1302 Mon Sep 17 00:00:00 2001
From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sat, 16 Jun 2018 22:46:04 +0100
Subject: Dgit.pm: Provide failmsg, previously buried in fail

Most of `fail' is error message construction.  This change allows
callers to do something other with the message, than pass it to die.

No functional change.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
---
 Debian/Dgit.pm | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

(limited to 'Debian/Dgit.pm')

diff --git a/Debian/Dgit.pm b/Debian/Dgit.pm
index d583417..3202180 100644
--- a/Debian/Dgit.pm
+++ b/Debian/Dgit.pm
@@ -44,7 +44,7 @@ BEGIN {
 		      server_branch server_ref
                       stat_exists link_ltarget
 		      hashfile
-                      fail ensuredir must_getcwd executable_on_path
+                      fail failmsg ensuredir must_getcwd executable_on_path
                       waitstatusmsg failedcmd_waitstatus
 		      failedcmd_report_cmd failedcmd
                       runcmd cmdoutput cmdoutput_errok
@@ -221,12 +221,16 @@ sub _us () {
     $::us // ($0 =~ m#[^/]*$#, $&);
 }
 
-sub fail { 
+sub failmsg {
     my $s = "@_\n";
     $s =~ s/\n\n$/\n/;
     my $prefix = _us().": ";
     $s =~ s/^/$prefix/gm;
-    die $s;
+    return $s;
+}
+
+sub fail {
+    die failmsg @_;
 }
 
 sub ensuredir ($) {
-- 
cgit v1.2.3