summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <thierry.vignaud@gmail.com>2015-05-19 05:18:04 -0400
committerThierry Vignaud <thierry.vignaud@gmail.com>2015-05-19 09:33:31 -0400
commitc8fc966d443c7a107a6156f7da19ad6ea71a4491 (patch)
treeddd301339701d8c48aa4b78d91883579c65c3fdd
parentaed58076b2046bebcca2b96a68656921ee7558ad (diff)
downloaddrakx-c8fc966d443c7a107a6156f7da19ad6ea71a4491.tar
drakx-c8fc966d443c7a107a6156f7da19ad6ea71a4491.tar.gz
drakx-c8fc966d443c7a107a6156f7da19ad6ea71a4491.tar.bz2
drakx-c8fc966d443c7a107a6156f7da19ad6ea71a4491.tar.xz
drakx-c8fc966d443c7a107a6156f7da19ad6ea71a4491.zip
fix crash with --windows_import (mga9347)
-rw-r--r--perl-install/NEWS1
-rwxr-xr-xperl-install/standalone/drakfont2
2 files changed, 2 insertions, 1 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS
index 24536588a..d2d7c2234 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -1,5 +1,6 @@
- drakfont:
o fix crash (mga#13627)
+ o fix crash with --windows_import (mga9347)
Version 16.97 - 18 May 2015
diff --git a/perl-install/standalone/drakfont b/perl-install/standalone/drakfont
index ade0d51c5..ad54ebae4 100755
--- a/perl-install/standalone/drakfont
+++ b/perl-install/standalone/drakfont
@@ -214,7 +214,7 @@ sub search_windows_font() {
return 0;
}
foreach my $font (@fonts) {
- progress($pbar, 0.25 / $nb_dir, N("parse all fonts"));
+ progress($pbar, 0.25 / $nb_dir, N("parse all fonts")) if $interactive;
my $font_name = basename($font);
!$replace && any { /^\Q$font_name\E$/ } @installed_fonts and next;
any { /^\Q$font_name\E$/ } @font_list or push @font_list, $font;