--- builds_bin/update_repos 2007/06/03 04:13:57 1.11 +++ builds_bin/update_repos 2007/07/03 14:14:22 1.14 @@ -27,6 +27,7 @@ my @repos = ( "$releasedir/$smerel/smeupdates-testing/$arch/RPMS", "$releasedir/$smerel/smeextras/$arch/RPMS", "$releasedir/$smerel/smeaddons/$arch/RPMS", + "$releasedir/$smerel/smecontribs/$arch/RPMS", "$releasedir/$smerel/smetest/$arch/RPMS", "$releasedir/$smerel/smedev/$arch/RPMS", "$builds/RPMS/$arch", @@ -43,6 +44,7 @@ my @srcrepos = ( "/mirrors/centos/$centosrel/extras/SRPMS", "/mirrors/rpmforge/dag/source", "/mirrors/atrpms/src/el$centosrel-$arch/atrpms/stable", + "/mirrors/atrpms/src/el$centosrel-$arch/atrpms/testing", "/mirrors/fedora/epel/$centosrel/SRPMS", "/mirrors/fedora/core/updates/$fedorarel/SRPMS", "/mirrors/fedora/core/$fedorarel/source/SRPMS", @@ -109,7 +111,7 @@ foreach my $repo ( reverse @srcrepos ) { } my @latest; -foreach my $rpm ( reverse grep { $_->{repo} =~ m{^$releasedir/$smerel/} && $_->{repo} !~ m{/smedev$} } @rpms ) { +foreach my $rpm ( reverse grep { $_->{repo} =~ m{^$releasedir/$smerel/} && $_->{repo} !~ m{/sme(addons|contribs|dev|extras)$} } @rpms ) { unless ( grep { $_->{name} eq $rpm->{name} && $_->{rpm} gt $rpm->{rpm} } @latest ) { push @latest, $rpm; unless ( grep { $_->{repo} eq $stagedir && $_->{filename} eq $rpm->{filename} } @rpms ) { @@ -130,6 +132,12 @@ foreach my $rpm ( grep { $_->{repo} eq $ $rpm->{repo} = 'deleted' unless grep { $_->{filename} eq $rpm->{filename} } @latest; } +foreach my $rpm ( reverse grep { $_->{repo} =~ m{^$releasedir/$smerel/} && $_->{repo} =~ m{/sme(addons|contribs|extras)$} } @rpms ) { + unless ( grep { $_->{name} eq $rpm->{name} && $_->{rpm} gt $rpm->{rpm} } @latest ) { + push @latest, $rpm; + } +} + my @devel; my %versions; foreach my $rpm ( grep { $_->{repo} eq 'builds' } @rpms ) { @@ -200,14 +208,14 @@ foreach my $repo ( keys %srpms ) { print "\n"; foreach my $repo ( sort keys %copy ) { - foreach my $rpm ( @{$copy{$repo}} ) { + foreach my $rpm ( keys %{{ map { $_ => 1 } @{$copy{$repo}} }} ) { print "copying $rpm to $repo/\n"; system(qw(cp --preserve=timestamps), $rpm, "$repo/"); } } print "\n"; -foreach my $rpm ( @remove, map { $_->{rpm}->filename } grep { $_->{repo} eq 'deleted' } @rpms ) { +foreach my $rpm ( keys %{{ map { $_ => 1 } (@remove, map { $_->{rpm}->filename } grep { $_->{repo} eq 'deleted' } @rpms) }} ) { print "removing $rpm\n"; unlink $rpm; }