From 6977c59931563c95a4ea2eaac80087d28771cdae Mon Sep 17 00:00:00 2001 From: Francois Pons Date: Tue, 27 Feb 2001 17:05:32 +0000 Subject: *** empty log message *** --- gendistrib | 8 ++++---- rpmtools.spec | 6 +++++- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/gendistrib b/gendistrib index 1987bce..7a416df 100755 --- a/gendistrib +++ b/gendistrib @@ -29,7 +29,7 @@ my ($noclean, $nohdlists, $nobasefiles, @root, @hdlists) = 0; @root > 0 && @ARGV == 0 or die "usage: gendistrib [--noclean] [--nohdlists] [--nobasefiles] --distrib ...\n"; -my ($i, $root) = (0, $root[0]); +my $root = $root[0]; my ($depslist, $provides, $compss, $hdlists) = ("$root/Mandrake/base/depslist.ordered", "$root/Mandrake/base/provides", "$root/Mandrake/base/compss", @@ -55,15 +55,15 @@ foreach () { close F; unless ($nohdlists) { - foreach (@hdlists) { - my ($hdlist, $dir, $descr) = @$_; + for (0..$#hdlists) { + my ($hdlist, $dir, $descr) = @{$hdlists[$_]}; #- try to find the right repository where can be found the directory #- listed in the hdlist file. #- if the number of root is equal the number of medium, assume a medium #- foreach root, else try to find a valid root containing the medium. if (scalar(@hdlists ) == scalar(@root)) { - $root = $root[$i]; + $root = $root[$_]; } else { foreach (@root) { -d "$_/$dir" and $root = $_, last; diff --git a/rpmtools.spec b/rpmtools.spec index 270847d..2a1ea45 100644 --- a/rpmtools.spec +++ b/rpmtools.spec @@ -1,5 +1,5 @@ %define name rpmtools -%define release 5mdk +%define release 6mdk # do not modify here, see Makefile in the CVS %define version 2.3 @@ -51,6 +51,10 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/perl5/man/*/* %changelog +* Tue Feb 27 2001 François Pons 2.3-6mdk +- fixed gendistrib with multi source of same number as + media listed in hdlists file. + * Mon Feb 26 2001 François Pons 2.3-5mdk - improved base flag usage so obsoleted use_base_flag. -- cgit v1.2.1