summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2003-01-24 14:24:41 +0000
committerPascal Rigaux <pixel@mandriva.com>2003-01-24 14:24:41 +0000
commit277ec70b75355d1e2b0eba613467783f53c0827e (patch)
tree26e1df918499c0d48081e55ac92c230feda33c10
parent7da6b7146113385973483c99cce20bfb84c1558b (diff)
downloaddrakx-backup-do-not-use-277ec70b75355d1e2b0eba613467783f53c0827e.tar
drakx-backup-do-not-use-277ec70b75355d1e2b0eba613467783f53c0827e.tar.gz
drakx-backup-do-not-use-277ec70b75355d1e2b0eba613467783f53c0827e.tar.bz2
drakx-backup-do-not-use-277ec70b75355d1e2b0eba613467783f53c0827e.tar.xz
drakx-backup-do-not-use-277ec70b75355d1e2b0eba613467783f53c0827e.zip
fix "Previous" button in warnAboutNaughtyServers, so there is 3 choices
(Previous, unselect servers, accept :)
-rw-r--r--perl-install/install_any.pm7
-rw-r--r--perl-install/install_steps_interactive.pm3
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 {