From ea57aaf0b6b207bf4130b6f43ad8bc7a74d5edeb Mon Sep 17 00:00:00 2001
From: Francois Pons <fpons@mandriva.com>
Date: Thu, 28 Feb 2002 13:11:30 +0000
Subject: fixed bad copy of install packages.

---
 rescue/tree/etc/oem | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/rescue/tree/etc/oem b/rescue/tree/etc/oem
index b38660019..de9682ed3 100755
--- a/rescue/tree/etc/oem
+++ b/rescue/tree/etc/oem
@@ -607,8 +607,8 @@ sub select_packages {
 
     #- INSTALL class need to be copied as closure (unless installed after).
     foreach (@{$o->{packages}{needToCopy}}) {
-	my $pkg = pkgs::packageByName($packages, $_);
-	pkgs::selectPackage($packages, $pkg);
+	my $pkg = pkgs::packageByName($o->{packages}, $_);
+	pkgs::selectPackage($o->{packages}, $pkg);
     }
 	
     #- first select package that have to go to closure according to their names.
@@ -907,7 +907,7 @@ sub readCompssUsers {
 }
 
 sub setSelectedFromCompssList {
-    my ($packages, $compssUsersChoice, $min_level, $max_size) = @_;
+    my ($packages, $compssUsersChoice, $min_level, $max_size, $otherOnly) = @_;
     $compssUsersChoice->{TRUE} = 1; #- ensure TRUE is set
     my $nb = selectedSize($packages);
     foreach my $p (sort { packageRate($b) <=> packageRate($a) } values %{$packages->{names}}) {
@@ -933,9 +933,15 @@ sub setSelectedFromCompssList {
 	}
 
 	#- at this point the package can safely be selected.
-	selectPackage($packages, $p);
+	if ($otherOnly) {
+	    selectPackage($packages, $p, 0, $otherOnly);
+	} else {
+	    selectPackage($packages, $p);
+	}
+    }
+    unless ($otherOnly) {
+	log::l("setSelectedFromCompssList: reached size ", formatXiB($nb), ", up to indice $min_level (less than ", formatXiB($max_size), ")");
+	log::l("setSelectedFromCompssList: ", join(" ", sort map { packageName($_) } grep { packageFlagSelected($_) } @{$packages->{depslist}}));
     }
-    log::l("setSelectedFromCompssList: reached size ", formatXiB($nb), ", up to indice $min_level (less than ", formatXiB($max_size), ")");
-    log::l("setSelectedFromCompssList: ", join(" ", sort map { packageName($_) } grep { packageFlagSelected($_) } @{$packages->{depslist}}));
     $min_level;
 }
-- 
cgit v1.2.1