* Fix a bug in inheritance of default settings in chained .mrconfig files.

diff --git a/debian/changelog b/debian/changelog
index a6e1e9b54b7f8315cdaa3c201fc6d3c5056ce8ce..ea49785695ec763ef5c95c7283efd494b9412c51 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,9 @@
 mr (0.2) UNRELEASED; urgency=low
 
   * Fix line number display for config file parse errors.
 mr (0.2) UNRELEASED; urgency=low
 
   * Fix line number display for config file parse errors.

+  * Fix a bug in inheritance of default settings in chained .mrconfig files.

 
 

- -- Joey Hess <joeyh@debian.org>  Sun, 14 Oct 2007 19:03:22 -0400
+ -- Joey Hess <joeyh@debian.org>  Tue, 16 Oct 2007 01:40:32 -0400

 
 mr (0.1) unstable; urgency=low
 
 
 mr (0.1) unstable; urgency=low
 

diff --git a/mr b/mr
index e29e3679bd75aa9a11a9e2b44d1d9f286a65e63d..adc05464671b0644be5e04b2b8167c6b89202cb6 100755 (executable)
--- a/mr
+++ b/mr
@@ -518,7 +518,10 @@ sub loadconfig { #{{{
 
                # copy in defaults from first parent
                my $parent=$dir;
 
                # copy in defaults from first parent
                my $parent=$dir;

-               while ($parent=~s/^(.*)\/[^\/]+\/?$/$1/) {
+               while ($parent=~s/^(.*\/)[^\/]+\/?$/$1/) {
+                       if ($parent eq '/') {
+                               $parent="";
+                       }

                        if (exists $config{$parent} &&
                            exists $config{$parent}{DEFAULT}) {
                                $config{$dir}{DEFAULT}={ %{$config{$parent}{DEFAULT}} };
                        if (exists $config{$parent} &&
                            exists $config{$parent}{DEFAULT}) {
                                $config{$dir}{DEFAULT}={ %{$config{$parent}{DEFAULT}} };