From 9fd4ad123f5bcf9cfc1280d9dd79f51ad9ac2a52 Mon Sep 17 00:00:00 2001
From: Francois Pons <fpons@mandriva.com>
Date: Tue, 16 Apr 2002 15:46:31 +0000
Subject: fixed stupid error.

---
 rescue/tree/etc/oem | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/rescue/tree/etc/oem b/rescue/tree/etc/oem
index 26f565a91..e698b16b3 100755
--- a/rescue/tree/etc/oem
+++ b/rescue/tree/etc/oem
@@ -530,7 +530,6 @@ system "rpm", "--root", "/mnt", "--initdb";
 #- keep in mind all the rpm files available (according to hdlists).
 my (%files, %rpms);
 
-#- copy and install from each cd image.
 require packdrake;
 foreach my $medium (@media) {
     my $packer = new packdrake("/cdrom/Mandrake/base/$medium->{hdlist}");
@@ -540,7 +539,10 @@ foreach my $medium (@media) {
 	$files{$fullname} = $file;
 	$rpms{$file} = $medium->{rpmsdir};
     }
+}
 
+#- copy and install from each cd image.
+foreach my $medium (@media) {
     while ($cd && ! -d "/cdrom/$medium->{rpmsdir}") {
 	system "unmount", "/dev/$cd";
 	system "eject", "/dev/$cd";
@@ -552,6 +554,7 @@ foreach my $medium (@media) {
     print "Copying packages from medium labeled \"$medium->{descr}\" to hard disk\n";
     system "mkdir", "-p", "/hd/$medium->{rpmsdir}";
     foreach my $pkg (@{$packages->{depslist}}) {
+	$files{rpm_fullname($pkg)} or next;
 	$pkg->{closure} && !$pkg->{selected} or next;
 	my $file = "/cdrom/$medium->{rpmsdir}/" . $files{rpm_fullname($pkg)};
 	if (-e $file) {
@@ -563,6 +566,7 @@ foreach my $medium (@media) {
 
     print "Installing packages from medium labeled \"$medium->{descr}\"\n";
     if (my $pkg = pkgs::packageByName($packages, 'glibc')) { #- HACK FOR GLIBC
+	$files{rpm_fullname($pkg)} or die "no glibc package found";
 	if (delete $pkg->{selected}) {
 	    my $file = "/cdrom/$medium->{rpmsdir}/" . $files{rpm_fullname($pkg)};
 	    if (-e $file) {
@@ -574,6 +578,7 @@ foreach my $medium (@media) {
     }
     my @files;
     foreach my $pkg (@{$packages->{depslist}}) {
+	$files{rpm_fullname($pkg)} or next;
 	$pkg->{selected} or next;
 	my $file = "/cdrom/$medium->{rpmsdir}/" . $files{rpm_fullname($pkg)};
 	if (-e $file) {
-- 
cgit v1.2.1