josch/multistrap
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

drop duplicate realpath check for included files.

Browse source 
git-svn-id: http://emdebian.org/svn/current@7522 563faec7-e20c-0410-992a-a66f704d0ccd
This commit is contained in:
codehelp 2010-10-03 18:56:42 +00:00
parent 01706647dc
commit ba99b959cd
1 changed files with 4 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
multistrap
View file

@ -93,18 +93,10 @@ $dpkgdir = "var/lib/dpkg/"; # state
$cfgdir=dirname($file); $cfgdir=dirname($file);
cascade($file); cascade($file);
foreach my $inc (@includes) foreach my $inc (@includes) {
{ # Translators: fields are programname, version string, include file.
# look for the full filepath or try same directory as current conf. printf (_g("%s %s including %s\n"), $progname, $ourversion, $inc);
if (not -f $inc ) { cascade($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);
} }
%uniq=(); %uniq=();
foreach my $line (@debootstrap) { foreach my $line (@debootstrap) {
@ -172,9 +164,6 @@ system ("mkdir -p ${dir}etc/apt/preferences.d/")
system ("mkdir -p ${dir}usr/share/info/") system ("mkdir -p ${dir}usr/share/info/")
if (not -d "${dir}usr/share/info/"); if (not -d "${dir}usr/share/info/");
system ("touch ${dir}usr/share/info/dir"); 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/; @dirs = qw/ alternatives info parts updates/;
@touch = qw/ diversions statoverride status lock/; @touch = qw/ diversions statoverride status lock/;