From b99336c5440cb50de9e8ca46833df72415deb723 Mon Sep 17 00:00:00 2001 From: Francois Pons Date: Thu, 14 Oct 1999 15:52:49 +0000 Subject: *** empty log message *** --- perl-install/install_steps.pm | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) (limited to 'perl-install/install_steps.pm') diff --git a/perl-install/install_steps.pm b/perl-install/install_steps.pm index 6794899f7..ffb2a14c4 100644 --- a/perl-install/install_steps.pm +++ b/perl-install/install_steps.pm @@ -181,10 +181,18 @@ sub beforeInstallPackages { sub installPackages($$) { my ($o, $packages) = @_; - #- my $toInstall = [ grep { $_->{selected} && !$_->{installed} } values %$packages ]; - my @toInstall = $packages->{basesystem}{selected} && !$packages->{basesystem}{installed} ? ($packages->{basesystem}) : (); - push @toInstall, grep { $_->{base} && $_->{selected} && !$_->{installed} } values %$packages; - push @toInstall, grep { !$_->{base} && $_->{selected} && !$_->{installed} } values %$packages; + #- hack to ensure proper ordering for installation of packages. + my @firstToInstall = qw(basesystem sed); + my %firstInstalled; + my @toInstall; + foreach (@firstToInstall) { + if ($packages->{$_}{selected} && !$packages->{$_}{installed}) { + push @toInstall, $packages->{$_}; + $firstInstalled{$_} = 1; #- avoid installing twice a package. + } + } + push @toInstall, grep { $_->{base} && $_->{selected} && !$_->{installed} && !$firstInstalled{$_->{name}} } values %$packages; + push @toInstall, grep { !$_->{base} && $_->{selected} && !$_->{installed} && !$firstInstalled{$_->{name}} } values %$packages; pkgs::install($o->{prefix}, \@toInstall); } -- cgit v1.2.1