diff options
Diffstat (limited to 'perl-install/install_any.pm')
| -rw-r--r-- | perl-install/install_any.pm | 33 |
1 files changed, 17 insertions, 16 deletions
diff --git a/perl-install/install_any.pm b/perl-install/install_any.pm index e28bf4e59..f57050115 100644 --- a/perl-install/install_any.pm +++ b/perl-install/install_any.pm @@ -97,23 +97,24 @@ sub getAvailableSpace { sub setPackages { my ($o) = @_; - my $useHdlist = $o->{method} !~ /nfs|hd/; - eval { $o->{packages} = pkgs::psUsingHdlist() } if $useHdlist; - $o->{packages} = pkgs::psUsingDirectory() if !$useHdlist || $@; - - pkgs::getDeps($o->{packages}); - - $o->{compss} = pkgs::readCompss ($o->{packages}); - $o->{compssList} = pkgs::readCompssList($o->{packages}); - push @{$o->{base}}, "kernel-smp" if smp::detect(); - - do { - my $p = $o->{packages}{$_} or log::l(), next; - pkgs::select($o->{packages}, $p, 1); - } foreach @{$o->{base}}; - + unless ($o->{package}) { + my $useHdlist = $o->{method} !~ /nfs|hd/; + eval { $o->{packages} = pkgs::psUsingHdlist() } if $useHdlist; + $o->{packages} = pkgs::psUsingDirectory() if !$useHdlist || $@; + + pkgs::getDeps($o->{packages}); + + $o->{compss} = pkgs::readCompss ($o->{packages}); + $o->{compssList} = pkgs::readCompssList($o->{packages}); + push @{$o->{base}}, "kernel-smp" if smp::detect(); + + do { + my $p = $o->{packages}{$_} or log::l(), next; + pkgs::select($o->{packages}, $p, 1); + } foreach @{$o->{base}}; + } + pkgs::setShowFromCompss($o->{compss}, $o->{installClass}, $o->{lang}); - pkgs::setSelectedFromCompssList($o->{compssList}, $o->{packages}, getAvailableSpace($o) * 0.7, $o->{installClass}, $o->{lang}); } |