From: martin f. krafft <madduck@madduck.net>
Date: Tue, 9 Sep 2014 07:02:09 +0000 (+0200)
Subject: Always ensure all parent .mrconfig files are loaded
X-Git-Url: https://git.madduck.net/code/myrepos.git/commitdiff_plain/d98311be7b311946f199443443d9fab3ecbaead9

Always ensure all parent .mrconfig files are loaded

There may be parent .mrconfig files between ~/.mrconfig and ./.mrconfig
that is not chain-loaded from ~/.mrconfig. Such is the case if you e.g.
download a team-repository to work (such as the debconf-team repo), but
you don't want to put it into the ~/.mrconfig chain.

In those cases, all parent .mrconfig files should be loaded, in case
there are settings or lib snippets needed in subdirectories.

Fortunately, the code already ensures that config files are only loaded
once, so this is trivial to patch.

Signed-off-by: martin f. krafft <madduck@madduck.net>
---

diff --git a/mr b/mr
index b7cd3cb..3c5321f 100755
--- a/mr
+++ b/mr
@@ -1317,6 +1317,7 @@ sub loadconfig {
 			if ($parent eq '/') {
 				$parent="";
 			}
+			loadconfig($parent);
 			if (exists $config{$parent} &&
 			    exists $config{$parent}{DEFAULT}) {
 				$config{$dir}{DEFAULT}={ %{$config{$parent}{DEFAULT}} };