summaryrefslogtreecommitdiffstats
path: root/perl-install/install_any.pm
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2004-01-19 12:02:31 +0000
committerPascal Rigaux <pixel@mandriva.com>2004-01-19 12:02:31 +0000
commit639ce13db0bc62ee9c9972a82401387c7d0f4339 (patch)
treee3a7091e01116da5d80ca834d8b35b2017bd19e0 /perl-install/install_any.pm
parent00143d19953ab4a244af2a9f845f55227c65d934 (diff)
downloaddrakx-639ce13db0bc62ee9c9972a82401387c7d0f4339.tar
drakx-639ce13db0bc62ee9c9972a82401387c7d0f4339.tar.gz
drakx-639ce13db0bc62ee9c9972a82401387c7d0f4339.tar.bz2
drakx-639ce13db0bc62ee9c9972a82401387c7d0f4339.tar.xz
drakx-639ce13db0bc62ee9c9972a82401387c7d0f4339.zip
select bestKernelPackage before selecting basesystem (otherwise basesystem already requires kernel)
Diffstat (limited to 'perl-install/install_any.pm')
-rw-r--r--perl-install/install_any.pm6
1 files changed, 3 insertions, 3 deletions
diff --git a/perl-install/install_any.pm b/perl-install/install_any.pm
index b8b31b58c..a1ae67a8d 100644
--- a/perl-install/install_any.pm
+++ b/perl-install/install_any.pm
@@ -292,14 +292,14 @@ sub setPackages {
#- open rpm db according to right mode needed.
$o->{packages}{rpmdb} ||= pkgs::rpmDbOpen($o->{prefix}, $rebuild_needed);
- pkgs::selectPackage($o->{packages},
- pkgs::packageByName($o->{packages}, 'basesystem') || die("missing basesystem package"), 1);
-
#- always try to select basic kernel (else on upgrade, kernel will never be updated provided a kernel is already
#- installed and provides what is necessary).
pkgs::selectPackage($o->{packages},
pkgs::bestKernelPackage($o->{packages}) || die("missing kernel package"), 1);
+ pkgs::selectPackage($o->{packages},
+ pkgs::packageByName($o->{packages}, 'basesystem') || die("missing basesystem package"), 1);
+
#- must be done after getProvides
pkgs::read_rpmsrate($o->{packages}, getFile("Mandrake/base/rpmsrate"));
($o->{compssUsers}, $o->{compssUsersSorted}) = pkgs::readCompssUsers($o->{meta_class});