summaryrefslogtreecommitdiffstats
path: root/perl-install
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mageia.org>2012-10-07 11:58:39 +0000
committerThierry Vignaud <tv@mageia.org>2012-10-07 11:58:39 +0000
commita163db778ee0de4f9c34b5b9a6cb17b8f41fc9a5 (patch)
tree8af1293b105f01231bb87c018061bb3eb5f95a0f /perl-install
parent018933d46709703cd10846d5d30774d1b91f47f9 (diff)
downloaddrakx-a163db778ee0de4f9c34b5b9a6cb17b8f41fc9a5.tar
drakx-a163db778ee0de4f9c34b5b9a6cb17b8f41fc9a5.tar.gz
drakx-a163db778ee0de4f9c34b5b9a6cb17b8f41fc9a5.tar.bz2
drakx-a163db778ee0de4f9c34b5b9a6cb17b8f41fc9a5.tar.xz
drakx-a163db778ee0de4f9c34b5b9a6cb17b8f41fc9a5.zip
(move_fonts) fix it
Diffstat (limited to 'perl-install')
-rw-r--r--perl-install/NEWS1
-rwxr-xr-xperl-install/standalone/drakfont2
2 files changed, 2 insertions, 1 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS
index 162f8abba..fd9efb336 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -1,6 +1,7 @@
- drakclock:
o do not crash if timezones cannot be listed (mga#6787)
- drakfont:
+ o fix a crash
o fix ttmkfdir path
Version 14.45 - 20 September 2012
diff --git a/perl-install/standalone/drakfont b/perl-install/standalone/drakfont
index 03df9aedc..68d7a0d8b 100755
--- a/perl-install/standalone/drakfont
+++ b/perl-install/standalone/drakfont
@@ -308,7 +308,7 @@ sub convert_ttf_fonts {
sub move_fonts {
my ($src_dir, $dest_dir, @extensions) = @_;
my @fonts = map { s!.*/!!; $_ } map { glob("$src_dir/*.$_") } @extensions;
- next if !@fonts;
+ return if !@fonts;
system('mv', "$src_dir/$_", $dest_dir) foreach @fonts;
}