summaryrefslogtreecommitdiffstats
path: root/perl-install/install2.pm
diff options
context:
space:
mode:
authorFrancois Pons <fpons@mandriva.com>2000-03-07 13:06:10 +0000
committerFrancois Pons <fpons@mandriva.com>2000-03-07 13:06:10 +0000
commit26f5c1cfb24bff40293d312c04572ab38a0148a0 (patch)
tree91a6ad9428736e5f763f7c92fd25544e96b4bce7 /perl-install/install2.pm
parent51cbb8aad9b16ac231d4902568d7a63847cb996c (diff)
downloaddrakx-26f5c1cfb24bff40293d312c04572ab38a0148a0.tar
drakx-26f5c1cfb24bff40293d312c04572ab38a0148a0.tar.gz
drakx-26f5c1cfb24bff40293d312c04572ab38a0148a0.tar.bz2
drakx-26f5c1cfb24bff40293d312c04572ab38a0148a0.tar.xz
drakx-26f5c1cfb24bff40293d312c04572ab38a0148a0.zip
*** empty log message ***
Diffstat (limited to 'perl-install/install2.pm')
-rw-r--r--perl-install/install2.pm18
1 files changed, 5 insertions, 13 deletions
diff --git a/perl-install/install2.pm b/perl-install/install2.pm
index 4bb38d9aa..bc00a3e6e 100644
--- a/perl-install/install2.pm
+++ b/perl-install/install2.pm
@@ -354,26 +354,22 @@ sub formatPartitions {
#------------------------------------------------------------------------------
sub choosePackages {
require pkgs;
- print "a\n";
$o->setPackages if $_[1] == 1;
- print "b\n";
$o->selectPackagesToUpgrade($o) if $o->{isUpgrade} && $_[1] == 1;
- print "c\n";
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
}
- print "d\n";
$o->choosePackages($o->{packages}, $o->{compss},
$o->{compssUsers}, $o->{compssUsersSorted}, $_[1] == 1);
- print "e\n";
my $pkg = pkgs::packageByName($o->{packages}, 'kdesu');
- print "f\n";
pkgs::unselectPackage($o->{packages}, $pkg) if $pkg && $o->{security} > 3;
- print "g\n";
- pkgs::packageSetFlagSelected(pkgs::packageByName($o->{packages}, $_), 1) foreach @{$o->{base}}; #- already done by selectPackagesToUpgrade.
- print "h\n";
+
+ #- check pre-condition where base backage has to be selected.
+ foreach (@{$o->{base}}) {
+ pkgs::packageFlagSelected(pkgs::packageByName($o->{packages}, $_)) or die "base package not selected";
+ }
}
}
@@ -381,13 +377,9 @@ sub choosePackages {
sub doInstallStep {
$o->readBootloaderConfigBeforeInstall if $_[1] == 1;
- print "i\n";
$o->beforeInstallPackages;
- print "j\n";
$o->installPackages($o->{packages});
- print "k\n";
$o->afterInstallPackages;
- print "l\n";
}
#------------------------------------------------------------------------------
sub miscellaneous {