From ba99b959cdf8de89ecccab463e40167ffe5f94d5 Mon Sep 17 00:00:00 2001
From: codehelp <codehelp@debian.org>
Date: Sun, 3 Oct 2010 18:56:42 +0000
Subject: [PATCH] drop duplicate realpath check for included files.

git-svn-id: http://emdebian.org/svn/current@7522 563faec7-e20c-0410-992a-a66f704d0ccd
---
 multistrap | 19 ++++---------------
 1 file changed, 4 insertions(+), 15 deletions(-)

diff --git a/multistrap b/multistrap
index ade3e20..aa2ac56 100755
--- a/multistrap
+++ b/multistrap
@@ -93,18 +93,10 @@ $dpkgdir = "var/lib/dpkg/";   # state
 $cfgdir=dirname($file);
 cascade($file);
 
-foreach my $inc (@includes)
-{
-	# look for the full filepath or try same directory as current conf.
-	if (not -f $inc ) {
-		$chk = `realpath $cfgdir/$inc 2>/dev/null`;
-		next if ($chk =~ /^\n?$/);
-		chomp ($chk);
-	} else {
-		$chk = $inc;
-	}
-	printf (_g("%s %s using %s\n"), $progname, $ourversion, $chk);
-	cascade($chk);
+foreach my $inc (@includes) {
+	# Translators: fields are programname, version string, include file.
+	printf (_g("%s %s including %s\n"), $progname, $ourversion, $inc);
+	cascade($inc);
 }
 %uniq=();
 foreach my $line (@debootstrap) {
@@ -172,9 +164,6 @@ system ("mkdir -p ${dir}etc/apt/preferences.d/")
 system ("mkdir -p ${dir}usr/share/info/")
 	if (not -d "${dir}usr/share/info/");
 system ("touch ${dir}usr/share/info/dir");
-my $msg = sprintf(_g("Unable to create directory '%s'\n"), "${dir}etc/apt/preferences.d/");
-die ($msg)
-	if (not -d "${dir}etc/apt/preferences.d/");
 
 @dirs = qw/ alternatives info parts updates/;
 @touch = qw/ diversions statoverride status lock/;