From 5df2bcca46d03cda4c31573b11c20ec254ae73a7 Mon Sep 17 00:00:00 2001
From: Olivier Blin <oblin@mandriva.com>
Date: Tue, 23 Sep 2008 17:51:21 +0000
Subject: inline o->{compssListLevel} usage and remove useless parameter

---
 perl-install/install/steps_interactive.pm | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'perl-install')

diff --git a/perl-install/install/steps_interactive.pm b/perl-install/install/steps_interactive.pm
index 4d3256c32..918303329 100644
--- a/perl-install/install/steps_interactive.pm
+++ b/perl-install/install/steps_interactive.pm
@@ -427,7 +427,7 @@ sub choosePackages {
     }
 
   chooseGroups:
-    $o->chooseGroups($o->{packages}, $o->{compssUsers}, $o->{compssListLevel}, \$individual) if $chooseGroups;
+    $o->chooseGroups($o->{packages}, $o->{compssUsers}, \$individual) if $chooseGroups;
 
     ($o->{packages_}{ind}) =
       install::pkgs::setSelectedFromCompssList($o->{packages}, $o->{rpmsrate_flags_chosen}, $o->{compssListLevel}, $availableC);
@@ -509,7 +509,7 @@ sub _chooseDesktop {
     }
 }
 sub chooseGroups {
-    my ($o, $packages, $compssUsers, $min_level, $individual) = @_;
+    my ($o, $packages, $compssUsers, $individual) = @_;
 
     #- for all groups available, determine package which belongs to each one.
     #- this will enable getting the size of each groups more quickly due to
@@ -518,9 +518,9 @@ sub chooseGroups {
     
     my $b = install::pkgs::saveSelected($packages);
     install::any::unselectMostPackages($o);
-    install::pkgs::setSelectedFromCompssList($packages, { CAT_SYSTEM => 1 }, $min_level, 0);
+    install::pkgs::setSelectedFromCompssList($packages, { CAT_SYSTEM => 1 }, $o->{compssListLevel}, 0);
     my $system_size = install::pkgs::selectedSize($packages);
-    my ($sizes, $pkgs) = install::pkgs::computeGroupSize($packages, $min_level);
+    my ($sizes, $pkgs) = install::pkgs::computeGroupSize($packages, $o->{compssListLevel});
     install::pkgs::restoreSelected($b);
     log::l("system_size: $system_size");
 
-- 
cgit v1.2.1