diff options
| author | Thierry Vignaud <tv@mandriva.org> | 2007-09-24 14:32:29 +0000 |
|---|---|---|
| committer | Thierry Vignaud <tv@mandriva.org> | 2007-09-24 14:32:29 +0000 |
| commit | 8d36cfc1730ec7f9ccf3b258d765a6d90906991b (patch) | |
| tree | a331fd0a77ff6a6d037ad59c2c4424b8b4be7f4e /perl-install | |
| parent | 608f8fc1b8991a58ae10ddaeb5c0751eed14ec75 (diff) | |
| download | drakx-8d36cfc1730ec7f9ccf3b258d765a6d90906991b.tar drakx-8d36cfc1730ec7f9ccf3b258d765a6d90906991b.tar.gz drakx-8d36cfc1730ec7f9ccf3b258d765a6d90906991b.tar.bz2 drakx-8d36cfc1730ec7f9ccf3b258d765a6d90906991b.tar.xz drakx-8d36cfc1730ec7f9ccf3b258d765a6d90906991b.zip | |
(list_fontpath) handle fontpath.d
Diffstat (limited to 'perl-install')
| -rw-r--r-- | perl-install/NEWS | 2 | ||||
| -rwxr-xr-x | perl-install/standalone/drakfont | 2 |
2 files changed, 3 insertions, 1 deletions
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; |