From 63c6900c272c88b5bd369fee7b2128dae017f48f Mon Sep 17 00:00:00 2001
From: Thierry Vignaud <tv@mandriva.org>
Date: Tue, 5 Jun 2007 10:39:42 +0000
Subject: (search_windows_font) fix crash

---
 perl-install/NEWS                | 1 +
 perl-install/standalone/drakfont | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/perl-install/NEWS b/perl-install/NEWS
index ed0071531..8f0302438 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -1,5 +1,6 @@
 - bootloader-config:
   o handle kernel-xen-uptodate (#31154)
+- drakfont: fix crash
 
 Version 10.4.132 -  05 June 2007, by Thierry Vignaud
 
diff --git a/perl-install/standalone/drakfont b/perl-install/standalone/drakfont
index d1277f71d..8b5715b06 100755
--- a/perl-install/standalone/drakfont
+++ b/perl-install/standalone/drakfont
@@ -218,8 +218,8 @@ sub search_windows_font() {
                 }
                 !$replace && any { /$i/ } @installed_fonts and next;
                 any { /$i$/ } @font_list or push @font_list,
-                  find { -e $_ } map { "$win_dir/$_->[1]/fonts/$_",
-                                         "$win_dir/$_->[1]/Fonts/$_" } $i;
+                  find { -e $_ } map { ("$win_dir/$_->[1]/fonts/$_",
+                                         "$win_dir/$_->[1]/Fonts/$_") } $i;
             }
         }
         $interactive && $nb_dir and progress($pbar, 1, N("done"));
-- 
cgit v1.2.1