diff options
| author | Mandrake <mandrake@mandriva.com> | 2006-11-15 12:07:36 +0000 |
|---|---|---|
| committer | Mandrake <mandrake@mandriva.com> | 2006-11-15 12:07:36 +0000 |
| commit | 014927ec77f4f21165d28108775a20886e3dd877 (patch) | |
| tree | 051287ee6628cadb5dbefd2fad4080617cc8853e | |
| parent | 50518086d006babfb31abd089c8f2bbd8fcfc39c (diff) | |
| download | mga-youri-core-014927ec77f4f21165d28108775a20886e3dd877.tar mga-youri-core-014927ec77f4f21165d28108775a20886e3dd877.tar.gz mga-youri-core-014927ec77f4f21165d28108775a20886e3dd877.tar.bz2 mga-youri-core-014927ec77f4f21165d28108775a20886e3dd877.tar.xz mga-youri-core-014927ec77f4f21165d28108775a20886e3dd877.zip | |
better search code for noarch and arch in the different media
| -rw-r--r-- | lib/Youri/Repository/Mandriva_upload.pm | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/lib/Youri/Repository/Mandriva_upload.pm b/lib/Youri/Repository/Mandriva_upload.pm index 5c515d9..533a7b5 100644 --- a/lib/Youri/Repository/Mandriva_upload.pm +++ b/lib/Youri/Repository/Mandriva_upload.pm @@ -376,20 +376,19 @@ sub get_revisions { print "Looking for package $package revisions for $target\n" if $self->{_verbose} > 0; my $arch = $user_context->{arch} || $package->get_arch(); - $arch = $self->{_noarch} if $arch eq 'noarch'; - my $path = $arch eq 'src' ? "$target/SRPMS/" : "$target/$arch/media"; + my $media_arch = $arch eq 'noarch' ? $self->{_noarch} : $arch; + my $path = $arch eq 'src' ? "$target/SRPMS/" : "$target/$media_arch/media"; my $media = $self->_get_media_config($target); my @packages; my $name = $package->get_name(); - my $arch = $package->get_arch(); - foreach my $media (keys %{$media->{$arch}}) { + foreach my $m (keys %{$media->{$media_arch}}) { push @packages, map { $self->get_package_class()->new(file => $_) } $self->get_files( $self->{_install_root}, - "$path/$media", + "$path/$m", $self->get_package_class()->get_pattern( - $name, + $name, undef, undef, $arch, |