summaryrefslogtreecommitdiffstats
path: root/perl-install
diff options
context:
space:
mode:
authorThierry Vignaud <thierry.vignaud@gmail.com>2015-05-19 05:24:23 -0400
committerThierry Vignaud <thierry.vignaud@gmail.com>2015-05-19 09:33:31 -0400
commitecac6fb0105f742ebd6a9b8ab3a533123fadbe38 (patch)
tree6cadaa503034b2a17fae6b606f7904a67169f43f /perl-install
parentc8fc966d443c7a107a6156f7da19ad6ea71a4491 (diff)
downloaddrakx-ecac6fb0105f742ebd6a9b8ab3a533123fadbe38.tar
drakx-ecac6fb0105f742ebd6a9b8ab3a533123fadbe38.tar.gz
drakx-ecac6fb0105f742ebd6a9b8ab3a533123fadbe38.tar.bz2
drakx-ecac6fb0105f742ebd6a9b8ab3a533123fadbe38.tar.xz
drakx-ecac6fb0105f742ebd6a9b8ab3a533123fadbe38.zip
fix an error with --testing (mga#13363)
also fix a non crash error with rm()
Diffstat (limited to 'perl-install')
-rw-r--r--perl-install/NEWS1
-rwxr-xr-xperl-install/standalone/drakfont4
2 files changed, 3 insertions, 2 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS
index d2d7c2234..dde8765bf 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -1,6 +1,7 @@
- drakfont:
o fix crash (mga#13627)
o fix crash with --windows_import (mga9347)
+ o fix an error with --testing (mga#13363)
Version 16.97 - 18 May 2015
diff --git a/perl-install/standalone/drakfont b/perl-install/standalone/drakfont
index ad54ebae4..96d9bb2ac 100755
--- a/perl-install/standalone/drakfont
+++ b/perl-install/standalone/drakfont
@@ -333,7 +333,7 @@ sub put_font_dir() {
if (@font_list) {
dir_created();
foreach my $i (@font_list) {
- cp_af($i, $drakfont_dir . "/tmp/tmp");
+ cp_af($i, $drakfont_dir . "/tmp/tmp") if !$::testing;
interactive_progress($pbar1, 1 / @font_list, N("Fonts copy"));
}
interactive_progress($pbar1, 0.01, N("done"));
@@ -379,7 +379,7 @@ sub put_font_dir() {
interactive_progress($pbar2, 1, N("done"));
interactive_progress($pbar3, 0.25, N("Suppress Temporary Files"));
- my_rm_rf("$drakfont_dir/tmp/");
+ my_rm_rf("$drakfont_dir/tmp/") if !$::testing;
system('xset fp rehash');
interactive_progress($pbar3, 0.30, N("done"));
}