summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mandriva.org>2007-06-06 15:36:08 +0000
committerThierry Vignaud <tv@mandriva.org>2007-06-06 15:36:08 +0000
commitcb92a44705d3c985c8c9530a3183edae4892ac05 (patch)
treecc1da70b6da4725b5aa748f4b8c0b9f27f099925
parentf9c5392f0e8897a3a5023d46c57f855aece82ad9 (diff)
downloaddrakx-backup-do-not-use-cb92a44705d3c985c8c9530a3183edae4892ac05.tar
drakx-backup-do-not-use-cb92a44705d3c985c8c9530a3183edae4892ac05.tar.gz
drakx-backup-do-not-use-cb92a44705d3c985c8c9530a3183edae4892ac05.tar.bz2
drakx-backup-do-not-use-cb92a44705d3c985c8c9530a3183edae4892ac05.tar.xz
drakx-backup-do-not-use-cb92a44705d3c985c8c9530a3183edae4892ac05.zip
(search_windows_font) fix crash (#28016)
-rw-r--r--perl-install/NEWS1
-rwxr-xr-xperl-install/standalone/drakfont5
2 files changed, 4 insertions, 2 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS
index be93bb1ec..9099af017 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -1,4 +1,5 @@
- drakfont:
+ o fix crash (#28016)
o fix enumerating fonts on old windows (#28016)
Version 10.4.133 - 05 June 2007, by Thierry Vignaud
diff --git a/perl-install/standalone/drakfont b/perl-install/standalone/drakfont
index 3a8e1594e..33d200fb4 100755
--- a/perl-install/standalone/drakfont
+++ b/perl-install/standalone/drakfont
@@ -217,9 +217,10 @@ sub search_windows_font() {
}
}
!$replace && any { /$i/ } @installed_fonts and next;
+ my $subdir = $_->[1];
any { /$i$/ } @font_list or push @font_list,
- find { -e $_ } map { ("$win_dir/$_->[1]/fonts/$_",
- "$win_dir/$_->[1]/Fonts/$_") } $i;
+ grep { -e $_ } map { ("$win_dir/w$subdir/fonts/$_",
+ "$win_dir/$subdir/Fonts/$_") } $i;
}
}
$interactive && $nb_dir and progress($pbar, 1, N("done"));