summaryrefslogtreecommitdiffstats
path: root/perl-install
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mandriva.org>2008-02-25 16:51:40 +0000
committerThierry Vignaud <tv@mandriva.org>2008-02-25 16:51:40 +0000
commitbdec6b5131dd22c36d0ebb70190350ca6e40a9e2 (patch)
treed4625e6c561591be0b7019d96afe70873645db81 /perl-install
parentd7219bbc1a55bfc91bfd8f90da33bc00cfb97a7b (diff)
downloaddrakx-backup-do-not-use-bdec6b5131dd22c36d0ebb70190350ca6e40a9e2.tar
drakx-backup-do-not-use-bdec6b5131dd22c36d0ebb70190350ca6e40a9e2.tar.gz
drakx-backup-do-not-use-bdec6b5131dd22c36d0ebb70190350ca6e40a9e2.tar.bz2
drakx-backup-do-not-use-bdec6b5131dd22c36d0ebb70190350ca6e40a9e2.tar.xz
drakx-backup-do-not-use-bdec6b5131dd22c36d0ebb70190350ca6e40a9e2.zip
(search_windows_font) fix crashing when encountering file names with
meta characters on windows partitions (#36482)
Diffstat (limited to 'perl-install')
-rw-r--r--perl-install/NEWS3
-rwxr-xr-xperl-install/standalone/drakfont4
2 files changed, 5 insertions, 2 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS
index ec1a59ed4..caf9b386f 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -1,5 +1,8 @@
- drakboot:
o make sure users are not listed twice (#38116)
+- drakfont:
+ o fix crashing when encountering file names with meta characters on
+ windows partitions (#36482)
- diskdrake:
o jfsprogs is now jfsutils
- drop support for arch now that rpmdrake-4.3 dropped it
diff --git a/perl-install/standalone/drakfont b/perl-install/standalone/drakfont
index 7871a94bf..fae4e5400 100755
--- a/perl-install/standalone/drakfont
+++ b/perl-install/standalone/drakfont
@@ -217,8 +217,8 @@ sub search_windows_font() {
foreach my $font (@fonts) {
progress($pbar, 0.25 / $nb_dir, N("parse all fonts"));
my $font_name = basename($font);
- !$replace && any { /^$font_name$/ } @installed_fonts and next;
- any { /^$font_name$/ } @font_list or push @font_list, $font;
+ !$replace && any { /^\Q$font_name\E$/ } @installed_fonts and next;
+ any { /^\Q$font_name\E$/ } @font_list or push @font_list, $font;
}
$interactive && $nb_dir and progress($pbar, 1, N("done"));
if (!@font_list) {