summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mandriva.org>2007-06-05 10:39:42 +0000
committerThierry Vignaud <tv@mandriva.org>2007-06-05 10:39:42 +0000
commit63c6900c272c88b5bd369fee7b2128dae017f48f (patch)
tree5acc2bc17c18e476ed1a757c2af9fae3881ece84
parent17b40f8aa6c759a71240d795bfe6a05bf18c5c92 (diff)
downloaddrakx-63c6900c272c88b5bd369fee7b2128dae017f48f.tar
drakx-63c6900c272c88b5bd369fee7b2128dae017f48f.tar.gz
drakx-63c6900c272c88b5bd369fee7b2128dae017f48f.tar.bz2
drakx-63c6900c272c88b5bd369fee7b2128dae017f48f.tar.xz
drakx-63c6900c272c88b5bd369fee7b2128dae017f48f.zip
(search_windows_font) fix crash
-rw-r--r--perl-install/NEWS1
-rwxr-xr-xperl-install/standalone/drakfont4
2 files changed, 3 insertions, 2 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS
index ed0071531..8f0302438 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -1,5 +1,6 @@
- bootloader-config:
o handle kernel-xen-uptodate (#31154)
+- drakfont: fix crash
Version 10.4.132 - 05 June 2007, by Thierry Vignaud
diff --git a/perl-install/standalone/drakfont b/perl-install/standalone/drakfont
index d1277f71d..8b5715b06 100755
--- a/perl-install/standalone/drakfont
+++ b/perl-install/standalone/drakfont
@@ -218,8 +218,8 @@ sub search_windows_font() {
}
!$replace && any { /$i/ } @installed_fonts and next;
any { /$i$/ } @font_list or push @font_list,
- find { -e $_ } map { "$win_dir/$_->[1]/fonts/$_",
- "$win_dir/$_->[1]/Fonts/$_" } $i;
+ find { -e $_ } map { ("$win_dir/$_->[1]/fonts/$_",
+ "$win_dir/$_->[1]/Fonts/$_") } $i;
}
}
$interactive && $nb_dir and progress($pbar, 1, N("done"));