summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIan Jackson <ijackson@chiark.greenend.org.uk>2018-06-16 22:46:04 +0100
committerIan Jackson <ijackson@chiark.greenend.org.uk>2018-06-16 23:25:50 +0100
commitb2576526b99a3dd484f33782c5f20d9d42db1302 (patch)
tree0c0e634b7010c11fd0715ccdc867c2303ac906b3
parentb65b59a3cf27c815676f0363897ac2c924209a15 (diff)
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>
-rw-r--r--Debian/Dgit.pm10
1 files changed, 7 insertions, 3 deletions
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 ($) {