From 639ce13db0bc62ee9c9972a82401387c7d0f4339 Mon Sep 17 00:00:00 2001 From: Pascal Rigaux Date: Mon, 19 Jan 2004 12:02:31 +0000 Subject: select bestKernelPackage before selecting basesystem (otherwise basesystem already requires kernel) --- perl-install/install_any.pm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'perl-install/install_any.pm') 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}); -- cgit v1.2.1