From d55618ebe3f2bfb368c8d127f1e83789d82f634c Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Fri, 9 Jul 2004 04:42:50 +0000
Subject: use "*" instead of PERL_VERSION in list, but ensure only one match

---
 rescue/list            |  2 +-
 rescue/make_rescue_img | 14 ++++++++++----
 2 files changed, 11 insertions(+), 5 deletions(-)

(limited to 'rescue')

diff --git a/rescue/list b/rescue/list
index f1209a845..c442d351b 100644
--- a/rescue/list
+++ b/rescue/list
@@ -129,7 +129,7 @@
 /usr/lib/perl5/PERL_VERSION/warnings.pm
 /usr/lib/perl5/PERL_VERSION/Carp.pm
 /usr/lib/perl5/PERL_VERSION/Exporter.pm
-/usr/lib/perl5/vendor_perl/PERL_VERSION/packdrake.pm
+/usr/lib/perl5/vendor_perl/*/packdrake.pm
 /usr/bin/lspci
 /usr/share/pci.ids
 /usr/bin/lspcidrake
diff --git a/rescue/make_rescue_img b/rescue/make_rescue_img
index 8afbb4d4e..9c7352338 100755
--- a/rescue/make_rescue_img
+++ b/rescue/make_rescue_img
@@ -74,10 +74,16 @@ foreach (keyboard::loadkeys_files()) {
 }
 
 my $perl_version = join ".", unpack "C3", $^V;
-@files = map { chomp; s/PERL_VERSION/$perl_version/g; s|/LIB/|/$lib/|g; $_ } (cat_("list"), cat_(`../tools/specific_arch list`));
-@files = `ls -d @files`; 
-$? == 0 or exit 1;
-
+my @bad;
+@files = map { 
+    chomp;
+    s/PERL_VERSION/$perl_version/g;
+    s|/LIB/|/$lib/|g;
+    my @l = glob($_) or push @bad, $_;
+    m|\*.*/| && @l != 1 and die "multiple match for $_\n";
+    @l;
+} (cat_("list"), cat_(`../tools/specific_arch list`));
+@bad and die "files missing\n" . join("\n", @bad) . "\n";
 install_l(@files);
 
 foreach (cat_("aliases")) {
-- 
cgit v1.2.1