From 5246ab3073fb332231747801be0eaadb39fc5efe Mon Sep 17 00:00:00 2001
From: Olivier Blin <oblin@mandriva.com>
Date: Tue, 23 Sep 2008 17:32:02 +0000
Subject: extract compssListLevel setting, for later factorization

---
 perl-install/install/install2.pm | 3 +++
 perl-install/install/steps.pm    | 2 --
 2 files changed, 3 insertions(+), 2 deletions(-)

(limited to 'perl-install')

diff --git a/perl-install/install/install2.pm b/perl-install/install/install2.pm
index 8724fda52..62405ec29 100644
--- a/perl-install/install/install2.pm
+++ b/perl-install/install/install2.pm
@@ -192,6 +192,9 @@ sub choosePackages {
     my ($auto) = @_;
     require install::pkgs;
 
+    require pkgs;
+    add2hash_($o, { compssListLevel => $pkgs::rpmsrate_rate_max }) 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.pm b/perl-install/install/steps.pm
index 53db56997..f24c8e945 100644
--- a/perl-install/install/steps.pm
+++ b/perl-install/install/steps.pm
@@ -273,8 +273,6 @@ sub choosePackages {
     my $availableCorrected = install::pkgs::invCorrectSize($available / sqr(1024)) * sqr(1024);
     log::l(sprintf "available size %s (corrected %s)", formatXiB($available), formatXiB($availableCorrected));
 
-    add2hash_($o, { compssListLevel => $pkgs::rpmsrate_rate_max }) if !$::auto_install;
-
     #- !! 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);
-- 
cgit v1.2.1