summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2004-07-09 04:42:50 +0000
committerPascal Rigaux <pixel@mandriva.com>2004-07-09 04:42:50 +0000
commitd55618ebe3f2bfb368c8d127f1e83789d82f634c (patch)
treef94233baee37bec4a912bb5b8e34a6f4e5fc0364
parent0344a3b5e4c6b9a261c1c0a17f3cb6f647364b23 (diff)
downloaddrakx-backup-do-not-use-d55618ebe3f2bfb368c8d127f1e83789d82f634c.tar
drakx-backup-do-not-use-d55618ebe3f2bfb368c8d127f1e83789d82f634c.tar.gz
drakx-backup-do-not-use-d55618ebe3f2bfb368c8d127f1e83789d82f634c.tar.bz2
drakx-backup-do-not-use-d55618ebe3f2bfb368c8d127f1e83789d82f634c.tar.xz
drakx-backup-do-not-use-d55618ebe3f2bfb368c8d127f1e83789d82f634c.zip
use "*" instead of PERL_VERSION in list, but ensure only one match
-rw-r--r--rescue/list2
-rwxr-xr-xrescue/make_rescue_img14
2 files changed, 11 insertions, 5 deletions
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")) {