From 6c9fd55a321183b45ee26ef13e9592084a55d6fe Mon Sep 17 00:00:00 2001
From: Thierry Vignaud <tv@mandriva.org>
Date: Thu, 20 Mar 2008 15:49:04 +0000
Subject: (list_fontpath) chkfontpath is no more mandatory

---
 perl-install/standalone/drakfont | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'perl-install')

diff --git a/perl-install/standalone/drakfont b/perl-install/standalone/drakfont
index fae4e5400..f537b37d8 100755
--- a/perl-install/standalone/drakfont
+++ b/perl-install/standalone/drakfont
@@ -166,7 +166,8 @@ my @installed_fonts_path;      # list of path included in xfs
 my @installed_fonts_full_path; # full path list of fonts to uninstall
 
 sub list_fontpath() {
-    foreach (uniq((map { expand_symlinks($_) } glob_("$fontpathd_dir/*")), grep { /\d+:\s/ } `$chkfontpath -l`)) {
+    foreach (uniq((map { expand_symlinks($_) } glob_("$fontpathd_dir/*")),
+                  (-x $chkfontpath ? grep { /\d+:\s/ } `$chkfontpath -l`) : ()) {
         chomp;
         s/\d+:\s//gi;
         s/:\w*$//gi;
-- 
cgit v1.2.1