From 6470d48aceaab27bd291303cfbb021b58629a013 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sat, 11 Jun 2011 12:31:24 -0400 Subject: [PATCH 1/1] Allow mr register to be used with mrconfig file that does not yet exist. Closes: #629217 --- debian/changelog | 2 ++ mr | 8 ++++---- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/debian/changelog b/debian/changelog index f5f4e7c..2168382 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,8 @@ mr (1.04) UNRELEASED; urgency=low * Improve trust errors displayed while bootstrapping. Closes: #628234 + * Allow mr register to be used with mrconfig file that does not yet + exist. Closes: #629217 -- Joey Hess Mon, 30 May 2011 14:55:09 -0400 diff --git a/mr b/mr index c58c3e1..4235151 100755 --- a/mr +++ b/mr @@ -1085,10 +1085,6 @@ sub loadconfig { $trusted=1; } else { - if (! -e $f) { - return; - } - my $absf=abs_path($f); if ($loaded{$absf}) { return; @@ -1123,6 +1119,10 @@ sub loadconfig { } } + if (! -e $f) { + return; + } + print "mr: loading config $f\n" if $verbose; open($in, "<", $f) || die "mr: open $f: $!\n"; } -- 2.39.5