summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOlivier Blin <oblin@mandriva.com>2008-09-24 15:39:04 +0000
committerOlivier Blin <oblin@mandriva.com>2008-09-24 15:39:04 +0000
commit020f6418029005668208a92156f73958d5c2df12 (patch)
treeb4d0c181100b7fa373d5b193528595a8621c2059
parent81d5c43c69ed9aea6b7f59725847384f5f28bba4 (diff)
downloaddrakx-020f6418029005668208a92156f73958d5c2df12.tar
drakx-020f6418029005668208a92156f73958d5c2df12.tar.gz
drakx-020f6418029005668208a92156f73958d5c2df12.tar.bz2
drakx-020f6418029005668208a92156f73958d5c2df12.tar.xz
drakx-020f6418029005668208a92156f73958d5c2df12.zip
always set compssListLevel in interactive choosePackages step (even in auto-install)
-rw-r--r--perl-install/install/install2.pm3
-rw-r--r--perl-install/install/steps_interactive.pm3
2 files changed, 3 insertions, 3 deletions
diff --git a/perl-install/install/install2.pm b/perl-install/install/install2.pm
index 573491b88..6b928c8e1 100644
--- a/perl-install/install/install2.pm
+++ b/perl-install/install/install2.pm
@@ -192,9 +192,6 @@ sub choosePackages {
my ($auto) = @_;
require install::pkgs;
- require pkgs;
- add2hash_($o, { compssListLevel => $pkgs::rpmsrate_rate_default }) if !$::auto_install;
-
#- always setPackages as it may have to copy hdlist and synthesis files.
installStepsCall($o, $auto, 'setPackages');
installStepsCall($o, $auto, 'choosePackages');
diff --git a/perl-install/install/steps_interactive.pm b/perl-install/install/steps_interactive.pm
index 918303329..7ab4b11e1 100644
--- a/perl-install/install/steps_interactive.pm
+++ b/perl-install/install/steps_interactive.pm
@@ -397,6 +397,9 @@ sub selectSupplMedia {
sub choosePackages {
my ($o) = @_;
+ require pkgs;
+ add2hash_($o, { compssListLevel => $pkgs::rpmsrate_rate_default });
+
my $w = $o->wait_message('', N("Looking for available packages..."));
my $availableC = install::steps::choosePackages($o, $pkgs::rpmsrate_rate_max);