summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrancois Pons <fpons@mandriva.com>2002-07-15 17:56:38 +0000
committerFrancois Pons <fpons@mandriva.com>2002-07-15 17:56:38 +0000
commit55443c091b5320fbc2eb194073d277293f98eaca (patch)
tree8296a498c16a641a4c2c5fd7ec011fe4957e432f
parent3b81169be1f89b6c9f72c599c91f74e906fa8249 (diff)
downloaddrakx-55443c091b5320fbc2eb194073d277293f98eaca.tar
drakx-55443c091b5320fbc2eb194073d277293f98eaca.tar.gz
drakx-55443c091b5320fbc2eb194073d277293f98eaca.tar.bz2
drakx-55443c091b5320fbc2eb194073d277293f98eaca.tar.xz
drakx-55443c091b5320fbc2eb194073d277293f98eaca.zip
synced.
-rw-r--r--perl-install/install2.pm8
1 files changed, 3 insertions, 5 deletions
diff --git a/perl-install/install2.pm b/perl-install/install2.pm
index c5f3cddde..38fdf4b52 100644
--- a/perl-install/install2.pm
+++ b/perl-install/install2.pm
@@ -199,15 +199,13 @@ sub choosePackages {
my ($clicked, $ent_number, $auto) = @_;
require pkgs;
- #- always setPackages as it may have to copy hdlist files and depslist file.
- installStepsCall($o, $auto, 'setPackages');
- installStepsCall($o, $auto, 'selectPackagesToUpgrade') if $o->{isUpgrade} && $ent_number == 1;
-
+ #- always setPackages as it may have to copy hdlist files and synthesis files.
+ installStepsCall($o, $auto, 'setPackages', $o->{isUpgrade} && $ent_number == 1);
installStepsCall($o, $auto, 'choosePackages', $o->{packages}, $o->{compssUsers}, $ent_number == 1);
log::l("compssUsersChoice's: ", join(" ", grep { $o->{compssUsersChoice}{$_} } keys %{$o->{compssUsersChoice}}));
#- check pre-condition where base backage has to be selected.
- pkgs::packageByName($o->{packages}, 'basesystem')->flag_selected or die "basesystem package not selected";
+ pkgs::packageByName($o->{packages}, 'basesystem')->flag_available or die "basesystem package not selected";
#- check if there are package that need installation.
$o->{steps}{installPackages}{done} = 0 if $o->{steps}{installPackages}{done} && pkgs::packagesToInstall($o->{packages}) > 0;