summaryrefslogtreecommitdiffstats
path: root/perl-install
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>1999-09-08 14:01:36 +0000
committerPascal Rigaux <pixel@mandriva.com>1999-09-08 14:01:36 +0000
commit76e650b30ec0a17c0e3647cab46386744e837281 (patch)
tree6e7f0ff80354b1185c942fb725d9de8ba9b64b17 /perl-install
parent1ed3df04928e77e7a2c53ad07a716fc4fa130ae7 (diff)
downloaddrakx-backup-do-not-use-76e650b30ec0a17c0e3647cab46386744e837281.tar
drakx-backup-do-not-use-76e650b30ec0a17c0e3647cab46386744e837281.tar.gz
drakx-backup-do-not-use-76e650b30ec0a17c0e3647cab46386744e837281.tar.bz2
drakx-backup-do-not-use-76e650b30ec0a17c0e3647cab46386744e837281.tar.xz
drakx-backup-do-not-use-76e650b30ec0a17c0e3647cab46386744e837281.zip
no_comment
Diffstat (limited to 'perl-install')
-rw-r--r--perl-install/install2.pm7
1 files changed, 2 insertions, 5 deletions
diff --git a/perl-install/install2.pm b/perl-install/install2.pm
index 3e51ad00d..c46226bb0 100644
--- a/perl-install/install2.pm
+++ b/perl-install/install2.pm
@@ -385,9 +385,7 @@ sub selectInstallClass {
$::beginner = $o->{installClass} eq "beginner";
$o->{partitions} = $suggestedPartitions{$o->{installClass}};
- addToBeDone {
- install_any::setPackages($o); #update package list
- } 'formatPartitions' unless $o->{steps}{doInstallStep}{done};
+ install_any::setPackages($o) if $o->{steps}{choosePackages}{entered} > 1;
}
#------------------------------------------------------------------------------
@@ -448,7 +446,7 @@ sub formatPartitions {
#------------------------------------------------------------------------------
#PADTODO
sub choosePackages {
- install_any::setPackages($o) if $_[1] == 1;
+ install_any::setPackages($o);
$o->choosePackages($o->{packages}, $o->{compss});
$o->{packages}{$_}{selected} = 1 foreach @{$o->{base}};
}
@@ -456,7 +454,6 @@ sub choosePackages {
#------------------------------------------------------------------------------
#PADTODO
sub doInstallStep {
- install_any::setPackages($o) unless $_[1]; # FIXME
$o->beforeInstallPackages;
$o->installPackages($o->{packages});
$o->afterInstallPackages;