diff options
| author | Thierry Vignaud <thierry.vignaud@gmail.com> | 2015-05-19 05:18:04 -0400 |
|---|---|---|
| committer | Thierry Vignaud <thierry.vignaud@gmail.com> | 2015-05-19 19:32:45 +0200 |
| commit | 84f87d21bcb44476243e93a4b840116ae64f27d2 (patch) | |
| tree | 1e22a7274bbc38a2c94158fce72f3aeb6f0aee25 | |
| parent | 6303663c376676ec4e4fdd005ed07165bdefa382 (diff) | |
| download | drakx-84f87d21bcb44476243e93a4b840116ae64f27d2.tar drakx-84f87d21bcb44476243e93a4b840116ae64f27d2.tar.gz drakx-84f87d21bcb44476243e93a4b840116ae64f27d2.tar.bz2 drakx-84f87d21bcb44476243e93a4b840116ae64f27d2.tar.xz drakx-84f87d21bcb44476243e93a4b840116ae64f27d2.zip | |
fix crash with --windows_import (mga9347)
bug introduced in commit a8111ada7f12b135d6abf5b6d86084b3377da08c
| -rw-r--r-- | perl-install/NEWS | 1 | ||||
| -rwxr-xr-x | perl-install/standalone/drakfont | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS index aff912053..408e2190f 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.26.13 - 14 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; |