Fix display of trust errors.

diff --git a/debian/changelog b/debian/changelog
index d47762515b3044fd705f972cca846c052cfd8244..513b47474509c7a76a570fdd6c3feb06383d071c 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+mr (1.10) UNRELEASED; urgency=low
+
+  * Fix display of trust errors.
+
+ -- Joey Hess <joeyh@debian.org>  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,
 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 262fab59519a63a20f4700271ccb455d74fc6acf..bcab403d27c29d1231f5961e72ff1154c96e7f0a 100755 (executable)
--- a/mr
+++ b/mr
@@ -1284,15 +1284,14 @@ sub loadconfig {
        };
        my $trusterror = sub {
                my $msg=shift;
        };
        my $trusterror = sub {
                my $msg=shift;

-               my ($err, $file, $lineno, $url)=@_;

        
                if (defined $bootstrap_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 {
                                "(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";
                }
        };
                                "(To trust this file, list it in ~/.mrtrust.)\n";
                }
        };