From 0a387dd75bc8a4a131020747fb43f477c0c0032a Mon Sep 17 00:00:00 2001 From: Sebastien Dupont Date: Thu, 1 Nov 2001 10:55:16 +0000 Subject: correction of empty vfat partition in windows inportation. --- perl-install/standalone/drakfont | 15 +++++---------- 1 file 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 "drakfont:: could not find any font in $win_dir/win*/fonts \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 "drakfont:: could not find any font in $win_dir/win*/fonts \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 "drakfont:: could not find any font in /win*/fonts \n"; + $interactive and display_error(_("could not find any font in /win*/fonts")); + return 0; + } 1; } -- cgit v1.2.1