From 7ee5b57055caee0be8e2796ec58f1a5139ab5f7d Mon Sep 17 00:00:00 2001
From: Thierry Vignaud <thierry.vignaud@gmail.com>
Date: Tue, 19 May 2015 05:24:23 -0400
Subject: fix an error with --testing (mga#13363)

also fix a non crash error with rm()
---
 perl-install/NEWS                | 1 +
 perl-install/standalone/drakfont | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/perl-install/NEWS b/perl-install/NEWS
index 408e2190f..30b170bd3 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.26.13 - 14 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"));
     }
-- 
cgit v1.2.1