diff options
| author | Thierry Vignaud <thierry.vignaud@gmail.com> | 2015-05-28 21:48:11 -0400 |
|---|---|---|
| committer | Thierry Vignaud <thierry.vignaud@gmail.com> | 2015-06-03 18:10:28 +0200 |
| commit | b6e862baada2150b90964a79fca55c2b36924b9d (patch) | |
| tree | 2252e4c918df06003a672d238ade7e0d496247d7 /perl-install | |
| parent | 99051e86059a7dc9df7ca81767f223ad380fe584 (diff) | |
| download | drakx-b6e862baada2150b90964a79fca55c2b36924b9d.tar drakx-b6e862baada2150b90964a79fca55c2b36924b9d.tar.gz drakx-b6e862baada2150b90964a79fca55c2b36924b9d.tar.bz2 drakx-b6e862baada2150b90964a79fca55c2b36924b9d.tar.xz drakx-b6e862baada2150b90964a79fca55c2b36924b9d.zip | |
fix moving fonts (mga#16074)
bug introduced in commit fa7f54e968cebad63914465a603aa65eef9af1be
also do not create files in / (mga#10501, mga#15996)
Diffstat (limited to 'perl-install')
| -rw-r--r-- | perl-install/NEWS | 3 | ||||
| -rwxr-xr-x | perl-install/standalone/drakfont | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS index f719e4feb..c713e1abe 100644 --- a/perl-install/NEWS +++ b/perl-install/NEWS @@ -1,3 +1,6 @@ +- drakfont: + o fix moving fonts (mga#16074) + Version 16.102 - 29 May 2015 - diskdrake: 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 { |