summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOlivier Blin <oblin@mandriva.com>2008-09-23 17:32:02 +0000
committerOlivier Blin <oblin@mandriva.com>2008-09-23 17:32:02 +0000
commit5246ab3073fb332231747801be0eaadb39fc5efe (patch)
tree98a728b338ffa4deb08426669a254a1e654f3e4c
parenta5bce321bfd4a258ae79f92bca1e0562da74100f (diff)
downloaddrakx-5246ab3073fb332231747801be0eaadb39fc5efe.tar
drakx-5246ab3073fb332231747801be0eaadb39fc5efe.tar.gz
drakx-5246ab3073fb332231747801be0eaadb39fc5efe.tar.bz2
drakx-5246ab3073fb332231747801be0eaadb39fc5efe.tar.xz
drakx-5246ab3073fb332231747801be0eaadb39fc5efe.zip
extract compssListLevel setting, for later factorization
-rw-r--r--perl-install/install/install2.pm3
-rw-r--r--perl-install/install/steps.pm2
2 files changed, 3 insertions, 2 deletions
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);