diff options
| author | Thierry Vignaud <tv@mandriva.org> | 2007-06-06 15:35:28 +0000 |
|---|---|---|
| committer | Thierry Vignaud <tv@mandriva.org> | 2007-06-06 15:35:28 +0000 |
| commit | f9c5392f0e8897a3a5023d46c57f855aece82ad9 (patch) | |
| tree | 43c72ee7b7a74ea7c05b5ae0246e2171812901b5 | |
| parent | 59e9c5215e7a3ad55270be1d7ffa473fc6d9fb19 (diff) | |
| download | drakx-f9c5392f0e8897a3a5023d46c57f855aece82ad9.tar drakx-f9c5392f0e8897a3a5023d46c57f855aece82ad9.tar.gz drakx-f9c5392f0e8897a3a5023d46c57f855aece82ad9.tar.bz2 drakx-f9c5392f0e8897a3a5023d46c57f855aece82ad9.tar.xz drakx-f9c5392f0e8897a3a5023d46c57f855aece82ad9.zip | |
(search_windows_font) fix enumerating fonts on old windows (#28016)
| -rw-r--r-- | perl-install/NEWS | 3 | ||||
| -rwxr-xr-x | perl-install/standalone/drakfont | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS index 2892c535b..be93bb1ec 100644 --- a/perl-install/NEWS +++ b/perl-install/NEWS @@ -1,3 +1,6 @@ +- drakfont: + o fix enumerating fonts on old windows (#28016) + Version 10.4.133 - 05 June 2007, by Thierry Vignaud - bootloader-config: diff --git a/perl-install/standalone/drakfont b/perl-install/standalone/drakfont index 8b5715b06..3a8e1594e 100755 --- a/perl-install/standalone/drakfont +++ b/perl-install/standalone/drakfont @@ -201,7 +201,7 @@ sub search_installed_fonts_full_path() { sub search_windows_font() { foreach my $fstab_line (grep { /vfat|smbfs|ntfs|fuse/ } cat_('/etc/mtab')) { my $win_dir = (split('\s', $fstab_line))[1]; - my @list_fonts_win = all("$win_dir/windows/fonts"), all("$win_dir/WINDOWS/Fonts"); + my @list_fonts_win = (all("$win_dir/windows/fonts"), all("$win_dir/WINDOWS/Fonts")); my @list_fonts_winnt = all("$win_dir/winnt/fonts"); my $nb_dir = @list_fonts_win + @list_fonts_winnt; foreach ([ \@list_fonts_win, "windows" ], |