From 51b9492dab4d6523fa888d70d940acfaa3c543d1 Mon Sep 17 00:00:00 2001
From: Thierry Vignaud <thierry.vignaud@gmail.com>
Date: Tue, 21 Jan 2014 07:02:12 +0100
Subject: do not warn if a screenshot already has been taked (mga#11176)

as help runs in a one shot process, it doesn't remember the warning has
already been done
---
 perl-install/install/NEWS   | 3 +++
 perl-install/install/any.pm | 3 +++
 2 files changed, 6 insertions(+)

(limited to 'perl-install/install')

diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS
index c130c99ec..04811e6df 100644
--- a/perl-install/install/NEWS
+++ b/perl-install/install/NEWS
@@ -1,3 +1,6 @@
+- help dialogs:
+  o do not warn if a screenshot already has been taked (mga#11176)
+
 Version 16.26.2 - 20 January 2014
 
 - left background for final release of Mageia 4
diff --git a/perl-install/install/any.pm b/perl-install/install/any.pm
index 9bad240c2..63b1d0316 100644
--- a/perl-install/install/any.pm
+++ b/perl-install/install/any.pm
@@ -1392,6 +1392,9 @@ sub take_screenshot {
     $nb++ while -e "$dir/$nb.png";
     system('fb2png', '/dev/fb0', "$dir/$nb.png", '0');
 
+    # help doesn't remember warning has been shown (one shot processes):
+    $warned ||= -e "$dir/1.png";
+
     if (!$warned && !$nowarn) {
 	$warned = 1;
 	$in->ask_warn('', N("Screenshots will be available after install in %s", "/root/DrakX-screenshots"));
-- 
cgit v1.2.1