From 8d36cfc1730ec7f9ccf3b258d765a6d90906991b Mon Sep 17 00:00:00 2001
From: Thierry Vignaud <tv@mandriva.org>
Date: Mon, 24 Sep 2007 14:32:29 +0000
Subject: (list_fontpath) handle fontpath.d

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

(limited to 'perl-install')

diff --git a/perl-install/NEWS b/perl-install/NEWS
index 344f03d60..82d642938 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -2,6 +2,8 @@
   o fix "Add to LVM"
 - drakclock:
   o fix race on ugtk2->exit that causes a crash (#33894)
+- drakfont:
+  o handle fontpath.d
 
 Version 10.4.209 - 22 September 2007, by Olivier "blino" Blin
 
diff --git a/perl-install/standalone/drakfont b/perl-install/standalone/drakfont
index 5f85e347b..c761af568 100755
--- a/perl-install/standalone/drakfont
+++ b/perl-install/standalone/drakfont
@@ -165,7 +165,7 @@ 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 (grep { /\d+:\s/ } `$chkfontpath -l`) {
+    foreach (uniq((map { expand_symlinks($_) } glob_('/etc/X11/fontpath.d/*')), grep { /\d+:\s/ } `$chkfontpath -l`)) {
         chomp;
         s/\d+:\s//gi;
         s/:\w*$//gi;
-- 
cgit v1.2.1