From 10186060dce29c932cc3c2a2d8b7520f10b7a695 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Thu, 22 Dec 2011 11:52:33 -0400 Subject: [PATCH] Fix display of trust errors. --- debian/changelog | 6 ++++++ mr | 5 ++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index d477625..513b474 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +mr (1.10) UNRELEASED; urgency=low + + * Fix display of trust errors. + + -- Joey Hess Thu, 22 Dec 2011 11:52:19 -0400 + mr (1.09) unstable; urgency=low * Remove dir_test hack and add a way for vcs tests to run perl code, diff --git a/mr b/mr index 262fab5..bcab403 100755 --- a/mr +++ b/mr @@ -1284,15 +1284,14 @@ sub loadconfig { }; my $trusterror = sub { my $msg=shift; - my ($err, $file, $lineno, $url)=@_; if (defined $bootstrap_url) { - die "mr: $err in untrusted $bootstrap_url line $lineno\n". + die "mr: $msg in untrusted $bootstrap_url line $lineno\n". "(To trust this url, --trust-all can be used; but please use caution;\n". "this can allow arbitrary code execution!)\n"; } else { - die "mr: $err in untrusted $file line $lineno\n". + die "mr: $msg in untrusted $f line $lineno\n". "(To trust this file, list it in ~/.mrtrust.)\n"; } }; -- 2.39.5