From 277ec70b75355d1e2b0eba613467783f53c0827e Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Fri, 24 Jan 2003 14:24:41 +0000
Subject: fix "Previous" button in warnAboutNaughtyServers, so there is 3
 choices (Previous, unselect servers, accept :)

---
 perl-install/install_any.pm               | 7 +++++--
 perl-install/install_steps_interactive.pm | 3 ++-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/perl-install/install_any.pm b/perl-install/install_any.pm
index f52bbc87d..b2d8ed0b7 100644
--- a/perl-install/install_any.pm
+++ b/perl-install/install_any.pm
@@ -412,7 +412,7 @@ sub unselectMostPackages {
 sub warnAboutNaughtyServers {
     my ($o) = @_;
     my @naughtyServers = pkgs::naughtyServers($o->{packages}) or return 1;
-    if (!$o->ask_yesorno('', 
+    my $r = $o->ask_from_list_('', 
 formatAlaTeX(N("You have selected the following server(s): %s
 
 
@@ -422,9 +422,12 @@ to upgrade as soon as possible.
 
 
 Do you really want to install these servers?
-", join(", ", @naughtyServers))), 1)) {
+", join(", ", @naughtyServers))), [ N_("Yes"), N_("No") ], 'Yes') or return;
+    if ($r ne 'Yes') {
+	log::l("unselecting naughty servers");
 	pkgs::unselectPackage($o->{packages}, pkgs::packageByName($o->{packages}, $_)) foreach @naughtyServers;
     }
+    1;
 }
 
 sub warnAboutRemovedPackages {
diff --git a/perl-install/install_steps_interactive.pm b/perl-install/install_steps_interactive.pm
index 62432d535..b3f374446 100644
--- a/perl-install/install_steps_interactive.pm
+++ b/perl-install/install_steps_interactive.pm
@@ -386,6 +386,7 @@ sub choosePackages {
     log::l("max size (level $min_mark) is : " . formatXiB($max_size));
     pkgs::restoreSelected($b);
 
+  chooseGroups:
     $o->chooseGroups($packages, $compssUsers, $min_mark, \$individual, $max_size) if !$o->{isUpgrade} && !$::corporate;
 
     ($o->{packages_}{ind}) =
@@ -394,7 +395,7 @@ sub choosePackages {
     $o->choosePackagesTree($packages) if $individual;
 
     install_any::warnAboutRemovedPackages($o, $o->{packages});
-    install_any::warnAboutNaughtyServers($o);
+    install_any::warnAboutNaughtyServers($o) or goto chooseGroups;
 }
 
 sub choosePackagesTree {
-- 
cgit v1.2.1