From: Joey Hess <joey@kitenet.net>
Date: Sat, 11 Jun 2011 16:31:24 +0000 (-0400)
Subject: Allow mr register to be used with mrconfig file that does not yet exist. Closes:... 
X-Git-Url: https://git.madduck.net/code/myrepos.git/commitdiff_plain/6470d48aceaab27bd291303cfbb021b58629a013?ds=sidebyside

Allow mr register to be used with mrconfig file that does not yet exist. Closes: #629217
---

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 <joeyh@debian.org>  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";
 	}