diff options
| -rwxr-xr-x | gendistrib | 11 | ||||
| -rw-r--r-- | packdrake-pm/packdrake.pm | 2 | ||||
| -rw-r--r-- | rpmtools.spec | 8 |
3 files changed, 13 insertions, 8 deletions
@@ -54,23 +54,24 @@ clean_cache(); for (0..$#hdlists) { my $e = $hdlists[$_]; + my $r; #- 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[$_]; + $r = $root[$_]; } else { foreach (@root) { - -d "$_/$e->{dir}" and $root = $_, last; + -d "$_/$e->{dir}" and $r = $_, last; } } - -d "$root/$e->{dir}" or die "unable to find a valid root directory which contains $e->{dir}\n"; + -d "$r/$e->{dir}" or die "unable to find a valid root directory which contains $e->{dir}\n"; - print STDERR "parsing rpm files in directory $root/$e->{dir}\n"; + print STDERR "parsing rpm files in directory $r/$e->{dir}\n"; my @headers = $urpm->parse_rpms_build_headers(dir => $headers_dir, - rpms => [ glob("$root/$e->{dir}/*.rpm") ]); + rpms => [ glob("$r/$e->{dir}/*.rpm") ]); $e->{headers} = \@headers; } diff --git a/packdrake-pm/packdrake.pm b/packdrake-pm/packdrake.pm index d4c26e0..16ab823 100644 --- a/packdrake-pm/packdrake.pm +++ b/packdrake-pm/packdrake.pm @@ -95,7 +95,7 @@ sub mkdir_ { mkdir_($root); } -d $_[0] and return; - mkdir $_[0], 0755 or die "packdrake: mkdir: error creating directory $_: $!\n"; + mkdir $_[0], 0755 or die "packdrake: mkdir: error creating directory $_[0]: $!\n"; } sub symlink_ { mkdir_ dirname($_[1]); unlink $_[1]; symlink $_[0], $_[1] } diff --git a/rpmtools.spec b/rpmtools.spec index afd9593..693cc26 100644 --- a/rpmtools.spec +++ b/rpmtools.spec @@ -1,5 +1,5 @@ %define name rpmtools -%define release 2mdk +%define release 3mdk # do not modify here, see Makefile in the CVS %define version 4.5 @@ -19,7 +19,7 @@ BuildRoot: %{_tmppath}/%{name}-buildroot Prefix: %{_prefix} BuildRequires: bzip2-devel gcc perl-devel rpm-devel >= 4.0 Requires: rpm >= %{rpm_version} bzip2 >= 1.0 perl-URPM >= 0.50-2mdk -Obsoletes: rpmtools-compat <= 2.0 rpmtools-devel <= 2.0 +Conflicts: rpmtools-compat <= 2.0 rpmtools-devel <= 2.0 %description Various tools needed by urpmi and drakxtools for handling rpm files. @@ -55,6 +55,10 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/*/* %changelog +* Wed Oct 16 2002 François Pons <fpons@mandrakesoft.com> 4.5-3mdk +- fixed bad error message for packdrake. +- fixed gendistrib with multiple directory given. + * Mon Aug 5 2002 Pixel <pixel@mandrakesoft.com> 4.5-2mdk - have packdrake.pm in non-arch dependent directory |