diff options
| -rw-r--r-- | perl-install/install/steps.pm | 6 | ||||
| -rw-r--r-- | perl-install/install/steps_interactive.pm | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/perl-install/install/steps.pm b/perl-install/install/steps.pm index f24c8e945..ecf0c2629 100644 --- a/perl-install/install/steps.pm +++ b/perl-install/install/steps.pm @@ -262,7 +262,7 @@ sub ask_change_cd { sub selectSupplMedia { '' } sub choosePackages { - my ($o) = @_; + my ($o, $o_compssListLevel) = @_; #- now for upgrade, package that must be upgraded are #- selected first, after is used the same scheme as install. @@ -274,8 +274,8 @@ sub choosePackages { log::l(sprintf "available size %s (corrected %s)", formatXiB($available), formatXiB($availableCorrected)); #- !! destroying user selection of packages (they may have done individual selection before) - exists $o->{compssListLevel} - and install::pkgs::setSelectedFromCompssList($o->{packages}, $o->{rpmsrate_flags_chosen}, $o->{compssListLevel}, $availableCorrected); + exists $o->{compssListLevel} || defined $o_compssListLevel + and install::pkgs::setSelectedFromCompssList($o->{packages}, $o->{rpmsrate_flags_chosen}, $o_compssListLevel || $o->{compssListLevel}, $availableCorrected); $availableCorrected; } diff --git a/perl-install/install/steps_interactive.pm b/perl-install/install/steps_interactive.pm index f0fa33c2c..d5e8b5f65 100644 --- a/perl-install/install/steps_interactive.pm +++ b/perl-install/install/steps_interactive.pm @@ -398,7 +398,7 @@ sub choosePackages { my ($o) = @_; my $w = $o->wait_message('', N("Looking for available packages...")); - my $availableC = &install::steps::choosePackages; + my $availableC = install::steps::choosePackages($o, $pkgs::rpmsrate_rate_max); require install::pkgs; |