diff options
| author | Sebastien Dupont <sdupont@mandriva.com> | 2001-11-01 10:55:16 +0000 |
|---|---|---|
| committer | Sebastien Dupont <sdupont@mandriva.com> | 2001-11-01 10:55:16 +0000 |
| commit | 0a387dd75bc8a4a131020747fb43f477c0c0032a (patch) | |
| tree | 0a8ed859fdd5700f478b5ba52aa0edcc9739001c | |
| parent | a03c2df1f97c0c463172840fcb145f871581b2d2 (diff) | |
| download | drakx-backup-do-not-use-0a387dd75bc8a4a131020747fb43f477c0c0032a.tar drakx-backup-do-not-use-0a387dd75bc8a4a131020747fb43f477c0c0032a.tar.gz drakx-backup-do-not-use-0a387dd75bc8a4a131020747fb43f477c0c0032a.tar.bz2 drakx-backup-do-not-use-0a387dd75bc8a4a131020747fb43f477c0c0032a.tar.xz drakx-backup-do-not-use-0a387dd75bc8a4a131020747fb43f477c0c0032a.zip | |
correction of empty vfat partition in windows inportation.
| -rwxr-xr-x | perl-install/standalone/drakfont | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/perl-install/standalone/drakfont b/perl-install/standalone/drakfont index 91bc045c5..bd1760f67 100755 --- a/perl-install/standalone/drakfont +++ b/perl-install/standalone/drakfont @@ -249,16 +249,6 @@ sub search_windows_font { my @list_fonts_win = all("$win_dir/windows/fonts"); my @list_fonts_winnt = all("$win_dir/winnt/fonts"); my $nb_dir = @list_fonts_win + @list_fonts_winnt; - if(!@list_fonts_win && !@list_fonts_winnt) { - print "[35mdrakfont:: could not find any font in $win_dir/win*/fonts [0m\n"; - $interactive and display_error(_("could not find any font in %s/win*/fonts", $win_dir)); - return 0; - } - if(!@list_fonts_win && !@list_fonts_winnt) { - print "[35mdrakfont:: could not find any font in $win_dir/win*/fonts [0m\n"; - $interactive and display_error(_("could not find any font in %s/win*/fonts", $win_dir)); - return 0; - } foreach $_ ([\@list_fonts_win, "windows"], [\@list_fonts_winnt, "winnt"]) { foreach my $i (@{$_->[0]}) { if($interactive) { @@ -273,6 +263,11 @@ sub search_windows_font { } $interactive && $nb_dir and progress($pbar, 1/4, _("done")); } + if(!@font_list) { + print "[35mdrakfont:: could not find any font in /win*/fonts [0m\n"; + $interactive and display_error(_("could not find any font in /win*/fonts")); + return 0; + } 1; } |