summaryrefslogtreecommitdiffstats
path: root/perl-install/install_any.pm
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2000-04-20 12:48:48 +0000
committerPascal Rigaux <pixel@mandriva.com>2000-04-20 12:48:48 +0000
commitc14cbfc9770053f195c74dcb1404bfa10c9da75f (patch)
treedfa3d4024251d99ec5ebd6384f2b0e9b00d7da7c /perl-install/install_any.pm
parent06ef0920b41b391d4d3953b03c4fd266872dcd82 (diff)
downloaddrakx-c14cbfc9770053f195c74dcb1404bfa10c9da75f.tar
drakx-c14cbfc9770053f195c74dcb1404bfa10c9da75f.tar.gz
drakx-c14cbfc9770053f195c74dcb1404bfa10c9da75f.tar.bz2
drakx-c14cbfc9770053f195c74dcb1404bfa10c9da75f.tar.xz
drakx-c14cbfc9770053f195c74dcb1404bfa10c9da75f.zip
no_comment
Diffstat (limited to 'perl-install/install_any.pm')
-rw-r--r--perl-install/install_any.pm12
1 files changed, 6 insertions, 6 deletions
diff --git a/perl-install/install_any.pm b/perl-install/install_any.pm
index a721ae99a..56fc9c5a7 100644
--- a/perl-install/install_any.pm
+++ b/perl-install/install_any.pm
@@ -252,8 +252,13 @@ sub setPackages($) {
push @{$o->{default_packages}}, "alsa" if modules::get_alias("sound") =~ /^snd-card-/;
pkgs::getDeps($o->{prefix}, $o->{packages});
+ pkgs::selectPackage($o->{packages}, pkgs::packageByName($o->{packages}, 'basesystem') || die("missing basesystem package"), 1);
+
+ #- must be done after selecting base packages (to save memory)
+ pkgs::getProvides($o->{packages});
$o->{compss} = pkgs::readCompss($o->{packages});
+ #- must be done after getProvides
$o->{compssListLevels} = pkgs::readCompssList($o->{packages});
($o->{compssUsers}, $o->{compssUsersSorted}) = pkgs::readCompssUsers($o->{packages}, $o->{compss});
@@ -264,12 +269,7 @@ sub setPackages($) {
require timezone;
require lang;
push @l, "isdn4k-utils" if ($o->{timezone}{timezone} || timezone::bestTimezone(lang::lang2text($o->{lang}))) =~ /Europe/;
- $_->{values} = [ map { $_ + 50 } @{$_->{values}} ] foreach grep {$_} map { $o->{packages}{$_} } @l;
-
- pkgs::selectPackage($o->{packages}, pkgs::packageByName($o->{packages}, 'basesystem') || die("missing basesystem package"), 1);
-
- #- must be done after selecting base packages (to save memory)
- pkgs::getProvides($o->{packages});
+ $_->{values} = [ map { $_ + 50 } @{$_->{values}} ] foreach grep {$_} map { pkgs::packageByName($o->{packages}, $_) } @l;
} else {
pkgs::unselectAllPackages($o->{packages});