From afce885e38b9bd48deb5b0ab8904f8cdd73c9b91 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sun, 4 Dec 2011 16:19:49 -0400 Subject: [PATCH 1/1] The previous fix for chaining to absolute paths broke chaining to relative paths with more than one path segment. (Thanks, Adam Spiers) --- debian/changelog | 2 ++ mr | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) 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 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") { -- 2.39.5