--- builds_bin/update_repos 2007/12/11 15:35:32 1.33 +++ builds_bin/update_repos 2007/12/16 17:30:58 1.34 @@ -351,7 +351,7 @@ foreach my $smever ( sort { $a <=> $b } } qx(rm -f $src) if exists $pkg->{delete} && ! $opts{t}; } elsif ( $pkg->{delete} ) { - print "delete from ", $pkg->{repo}, " (", basename($pkg->{rpm}->filename), ")\n"; + print "delete from ", $pkg->{repo}, " (", $pkg->{arch}, ", ", basename($pkg->{rpm}->filename), ")\n"; qx(rm -f $src) unless $opts{t}; $repochg{$pkg->{repo}}++ unless $repos->{$pkg->{repo}}->{base} || $repos->{$pkg->{repo}}->{stage}; } @@ -440,6 +440,11 @@ sub process_rpm { return if $skippkg->{$smever}->{$repo} && $skippkg->{$smever}->{$repo}->{$src}; return if $repos->{$repo}->{base} && $nosig; if ( $nosig && ! -f "$HOME/.rpmpass" ) { print " * missing signature (" .$pkg->filename . ")\n"; return; } + my $arch = 'unknown'; + $arch = 'SRPMS' if $pkg->filename =~ m{[/-](SRPMS?|src|source)/}; + $arch = 'x86_64' if $pkg->filename =~ m{[/-]x86_64/}; + $arch = 'i386' if $pkg->filename =~ m{[/-](i[356]86)/}; + $arch = 'noarch' if $pkg->filename =~ m{[/-]noarch/}; my $rpmhash = { base => $src, name => $pkg->name, @@ -447,6 +452,7 @@ sub process_rpm { nvra => $pkg->name.'-'.$pkg->version.'-'.$pkg->release.'.'.( $pkg->is_source_package ? 'src' : $pkg->tag('ARCH') ), svr => $src.'-'.$version.'-'.$release, src => $pkg->is_source_package, + arch => $arch, ver => $version, rel => $release, rpm => $pkg,