summaryrefslogtreecommitdiffstats
path: root/perl-install/install2.pm
diff options
context:
space:
mode:
authorFrancois Pons <fpons@mandriva.com>2000-04-27 22:22:49 +0000
committerFrancois Pons <fpons@mandriva.com>2000-04-27 22:22:49 +0000
commit053755d74f85fa59781581589ddd06cb59949333 (patch)
tree9973a83464ec2befd8832b1cd2f1b077ebe36410 /perl-install/install2.pm
parent1ebf6242bfbbe356cb8cb0e61395ba675afc0e75 (diff)
downloaddrakx-backup-do-not-use-053755d74f85fa59781581589ddd06cb59949333.tar
drakx-backup-do-not-use-053755d74f85fa59781581589ddd06cb59949333.tar.gz
drakx-backup-do-not-use-053755d74f85fa59781581589ddd06cb59949333.tar.bz2
drakx-backup-do-not-use-053755d74f85fa59781581589ddd06cb59949333.tar.xz
drakx-backup-do-not-use-053755d74f85fa59781581589ddd06cb59949333.zip
*** empty log message ***
Diffstat (limited to 'perl-install/install2.pm')
-rw-r--r--perl-install/install2.pm32
1 files changed, 16 insertions, 16 deletions
diff --git a/perl-install/install2.pm b/perl-install/install2.pm
index 940675c23..fd9cfc9dc 100644
--- a/perl-install/install2.pm
+++ b/perl-install/install2.pm
@@ -345,24 +345,24 @@ sub formatPartitions {
#------------------------------------------------------------------------------
sub choosePackages {
require pkgs;
- $o->setPackages if $_[1] == 1;
- $o->selectPackagesToUpgrade($o) if $o->{isUpgrade} && $_[1] == 1;
- if ($_[1] > 1 || !$o->{isUpgrade} || $::expert) {
- if ($_[1] == 1) {
- $o->{compssUsersChoice}{$_} = 1 foreach @{$o->{compssUsersSorted}}, 'Miscellaneous';
-# $o->{compssUsersChoice}{KDE} = 0 if $o->{lang} =~ /ja|el|ko|th|vi|zh/; #- gnome handles much this fonts much better
- }
- $o->choosePackages($o->{packages}, $o->{compss},
- $o->{compssUsers}, $o->{compssUsersSorted}, $_[1] == 1);
- my $pkg = pkgs::packageByName($o->{packages}, 'kdesu');
- pkgs::unselectPackage($o->{packages}, $pkg) if $pkg && $o->{security} > 3;
-
- #- check pre-condition where base backage has to be selected.
- pkgs::packageFlagSelected(pkgs::packageByName($o->{packages}, 'basesystem')) or die "basesystem package not selected";
+ if ($_[1] == 1) {
+ $o->setPackages;
+ $o->selectPackagesToUpgrade($o) if $o->{isUpgrade};
- #- check if there are package that need installation.
- $o->{steps}{doInstallStep}{done} = 0 if $o->{steps}{doInstallStep}{done} && pkgs::packagesToInstall($o->{packages}) > 0;
+ $o->{compssUsersChoice}{$_} = 1 foreach @{$o->{compssUsersSorted}}, 'Miscellaneous';
+ # $o->{compssUsersChoice}{KDE} = 0 if $o->{lang} =~ /ja|el|ko|th|vi|zh/; #- gnome handles much this fonts much better
}
+
+ $o->choosePackages($o->{packages}, $o->{compss},
+ $o->{compssUsers}, $o->{compssUsersSorted}, $_[1] == 1);
+ my $pkg = pkgs::packageByName($o->{packages}, 'kdesu');
+ pkgs::unselectPackage($o->{packages}, $pkg) if $pkg && $o->{security} > 3;
+
+ #- check pre-condition where base backage has to be selected.
+ pkgs::packageFlagSelected(pkgs::packageByName($o->{packages}, 'basesystem')) or die "basesystem package not selected";
+
+ #- check if there are package that need installation.
+ $o->{steps}{doInstallStep}{done} = 0 if $o->{steps}{doInstallStep}{done} && pkgs::packagesToInstall($o->{packages}) > 0;
}
#------------------------------------------------------------------------------