releasing version 1.10

[code/myrepos.git] / mr

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 ($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";
                }
        };