summaryrefslogtreecommitdiffstats
path: root/perl-install/install_any.pm
diff options
context:
space:
mode:
authorpad <pad@mandriva.com>1999-09-04 20:12:44 +0000
committerpad <pad@mandriva.com>1999-09-04 20:12:44 +0000
commit8d5fe6fe6ab47eb0b460fd954b047313a7e431bc (patch)
tree72a744f93e3eac4696736f2054bad7da5730b612 /perl-install/install_any.pm
parentae0f6ee505aea267da6900eb199f8fd1659a2b94 (diff)
downloaddrakx-8d5fe6fe6ab47eb0b460fd954b047313a7e431bc.tar
drakx-8d5fe6fe6ab47eb0b460fd954b047313a7e431bc.tar.gz
drakx-8d5fe6fe6ab47eb0b460fd954b047313a7e431bc.tar.bz2
drakx-8d5fe6fe6ab47eb0b460fd954b047313a7e431bc.tar.xz
drakx-8d5fe6fe6ab47eb0b460fd954b047313a7e431bc.zip
focus + packages dependencies
Diffstat (limited to 'perl-install/install_any.pm')
-rw-r--r--perl-install/install_any.pm33
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});
}