From: Joey Hess <joey@kitenet.net>
Date: Sun, 4 Dec 2011 20:19:49 +0000 (-0400)
Subject: The previous fix for chaining to absolute paths broke chaining to relative paths... 
X-Git-Url: https://git.madduck.net/code/myrepos.git/commitdiff_plain/afce885e38b9bd48deb5b0ab8904f8cdd73c9b91?ds=sidebyside;hp=e2ccc21918b8a4bdfecc4a8e078f36d8b1b164a0

The previous fix for chaining to absolute paths broke chaining to relative paths with more than one path segment. (Thanks, Adam Spiers)
---

diff --git a/debian/changelog b/debian/changelog
index b02ee83..4a291c6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,8 @@ mr (1.07) UNRELEASED; urgency=low
     Thanks, Richard Hartmann 
   * Block tty control codes in untrusted mr config files.
   * Correct printing of line numbers when includes are used. Closes: #650952
+  * The previous fix for chaining to absolute paths broke chaining to relative
+    paths with more than one path segment. (Thanks, Adam Spiers)
 
  -- Joey Hess <joeyh@debian.org>  Tue, 29 Nov 2011 18:15:51 -0400
 
diff --git a/mr b/mr
index d3c79ac..956dd7d 100755
--- a/mr
+++ b/mr
@@ -1298,7 +1298,7 @@ sub loadconfig {
 				if ($parameter eq 'chain' &&
 				    length $dir && $section ne "DEFAULT") {
 					my $chaindir="$section";
-					if ($chaindir !~ m!/!) {
+					if ($chaindir !~ m!^/!) {
 						$chaindir=$dir.$chaindir;
 					}
 					if (-e "$chaindir/.mrconfig") {