summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <thierry.vignaud@gmail.com>2015-05-28 21:48:11 -0400
committerThierry Vignaud <thierry.vignaud@gmail.com>2015-06-03 19:49:40 +0200
commit480be722cbbce713c93341492ac94211f6165c9e (patch)
treeaccf49a4c7cb24a8477762286d0eebc600376f00
parentd9afa7ec4acfc9335e219965944cbd3cbb4ff47d (diff)
downloaddrakx-480be722cbbce713c93341492ac94211f6165c9e.tar
drakx-480be722cbbce713c93341492ac94211f6165c9e.tar.gz
drakx-480be722cbbce713c93341492ac94211f6165c9e.tar.bz2
drakx-480be722cbbce713c93341492ac94211f6165c9e.tar.xz
drakx-480be722cbbce713c93341492ac94211f6165c9e.zip
fix moving fonts (mga#16074)distro/mga4
bug introduced in commit fa7f54e968cebad63914465a603aa65eef9af1be also do not create files in / (mga#10501, mga#15996)
-rw-r--r--perl-install/NEWS3
-rwxr-xr-xperl-install/standalone/drakfont2
2 files changed, 4 insertions, 1 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS
index 71c869f5b..06508fd53 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -1,3 +1,6 @@
+- drakfont:
+ o fix moving fonts (mga#16074)
+
Version 16.26.14 - 19 May 2015
- all tools:
diff --git a/perl-install/standalone/drakfont b/perl-install/standalone/drakfont
index 96d9bb2ac..cebb1156b 100755
--- a/perl-install/standalone/drakfont
+++ b/perl-install/standalone/drakfont
@@ -309,7 +309,7 @@ sub move_fonts {
my ($src_dir, $dest_dir, @extensions) = @_;
my @fonts = map { s!.*/!!; $_ } map { glob("$src_dir/*.$_") } @extensions;
return if !@fonts;
- system('mv', "$src_dir/$_", $dest_dir) foreach @fonts;
+ system('mv', "$src_dir/$_", "$src_dir/$dest_dir") foreach @fonts;
}
sub my_rm_rf {