--- builds_bin/update_repos	2007/05/19 22:06:29	1.10
+++ builds_bin/update_repos	2007/06/03 04:13:57	1.11
@@ -50,42 +50,57 @@ my @srcrepos = (
                  "$builds/SRPMS",
               );
 
-my %repohash;
-my %srcrepohash;
-my %changed;
-my %copy;
-my @remove;
-
 my $rpm_flags = RPM2->vsf_nodsaheader | RPM2->vsf_nodsa;
 
-%{$srcrepohash{$stagedir}} = map { $_ => 0 } grep { /\.rpm$/ } readdir SRPMS if ( opendir SRPMS, "$stagedir/SRPMS" );
-closedir SRPMS;
+my @rpms;
+my %srpms;
+my %sources;
+my %changed;
+my %copy;
 
 foreach my $repo ( @repos ) {
-        if ( $repo =~ m{^($releasedir/$smerel/sme[^/]*)/} ) {
-                my $srcrepo = $1;
-
-                %{$srcrepohash{$srcrepo}} = map { $_ => 0 } grep { /\.rpm$/ } readdir SRPMS if ( opendir SRPMS, "$srcrepo/SRPMS" );
-                closedir SRPMS;
-        }
-
-        opendir RPMS, $repo;
-        foreach my $rpm ( grep { m{\.rpm} } readdir RPMS ) {
-                my $header = RPM2->open_package("$repo/$rpm", $rpm_flags);
-                my $pkg = $header->tag("NAME").".".$header->tag("ARCH");
-                if ( $repo =~ m{$stagedir/RPMS} ) {
-                        push @{$repohash{$pkg}{$stagedir}}, $header;
-                } elsif ( $repo =~ m{$builds/RPMS} ) {
-                        push @{$repohash{$pkg}{builds}}, $header;
-                } elsif ( $repo =~ m{^($releasedir/$smerel/sme[^/]*)/} ) {
-                        my $pos = $1;
-                        push @{$repohash{$pkg}{$pos}}, $header;
-                }
-        }
-        closedir RPMS;
+	my $r = $repo;
+	if ( $repo =~ m{$stagedir/RPMS} ) {
+		$r = $stagedir;
+	} elsif ( $repo =~ m{$builds/RPMS} ) {
+		$r = 'builds';
+	} elsif ( $repo =~ m{^($releasedir/$smerel/sme[^/]*)/} ) {
+		$r = $1;
+	}
+
+	if ( $r ne 'builds' ) {
+		opendir SRPMS, "$r/SRPMS" or next;
+		foreach my $srpm ( grep { /\.rpm$/ } readdir SRPMS ) {
+			$srpms{$r}{$srpm} = 0;
+			$sources{$srpm} = "$r/SRPMS";
+		}
+		closedir SRPMS;
+	}
+
+	opendir RPMS, $repo or next;
+	foreach my $pkg ( reverse sort map { RPM2->open_package("$repo/$_", $rpm_flags); } grep { /\.rpm$/ } readdir RPMS ) {
+		my $rpm = { name => $pkg->tag("NAME"),
+				filename => join("-", map { $pkg->tag($_) } qw/name version release/) . "." . $pkg->tag("ARCH"),
+				version => $pkg->tag("VERSION"),
+				release => $pkg->tag("RELEASE"),
+				repo => $r,
+				rpm => $pkg,
+			      };
+		my $source = $pkg->tag("SOURCERPM");
+		$source =~ s#-$rpm->{version}-$rpm->{release}.*##;
+		$rpm->{source} = $source;
+
+		if ( $rpm->{repo} =~ m{^$releasedir/$smerel/} && $rpm->{repo} !~ m{/smedev$} ) {
+			$rpm->{repo} = 'deleted' if grep { $_->{repo} ne $rpm->{repo} && $_->{name} eq $rpm->{name} && $_->{rpm} ge $rpm->{rpm} } @rpms;
+			$rpm->{repo} = 'deleted' if grep { $_->{repo} eq $rpm->{repo} && $_->{name} eq $rpm->{name} && $_->{rpm} gt $rpm->{rpm} } @rpms;
+			$changed{$r}++ if $rpm->{repo} eq 'deleted';
+		}
+
+		push @rpms, $rpm;
+	}
+	closedir RPMS;
 }
 
-my %sources;
 foreach my $repo ( reverse @srcrepos ) {
         my %temp_repo = map { $_ => $repo } grep { /\.rpm$/ } readdir SRPMS if ( opendir SRPMS, $repo );
         closedir SRPMS;
@@ -93,160 +108,115 @@ foreach my $repo ( reverse @srcrepos ) {
         %sources = (%sources, %temp_repo);
 }
 
-foreach my $pkg ( keys %repohash ) {
-        foreach my $repo ( @repos ) {
-                if ( $repo =~ m{$stagedir/RPMS} ) {
-                        next unless $repohash{$pkg};
-                        if ( $repohash{$pkg}{$stagedir} ) {
-                                my ($latest, @rest) = sort { $b cmp $a } @{$repohash{$pkg}{$stagedir}};
-                                delete $repohash{$pkg}{$stagedir};
-                                push @remove, map { $_->filename } @rest if @rest;
-                                if ( $repohash{$pkg}{latest} ) {
-                                        if ($repohash{$pkg}{latest} ne $latest ) {
-                                                push @remove, $latest->filename;
-                                                push @{$copy{"$stagedir/RPMS"}}, $repohash{$pkg}{latest}->filename;
-                                                $repohash{$pkg}{$stagedir} = $repohash{$pkg}{latest};
-                                        } else {
-                                                $repohash{$pkg}{$stagedir} = $latest;
-                                        }
-                                } else {
-                                        push @remove, $latest->filename;
-                                }
-                        } elsif ( $repohash{$pkg}{latest} ) {
-                                push @{$copy{"$stagedir/RPMS"}}, $repohash{$pkg}{latest}->filename;
-                                $repohash{$pkg}{$stagedir} = $repohash{$pkg}{latest};
-                        }
-                } elsif ( $repo =~ m{^($releasedir/$smerel/sme[^/]*)/} ) {
-                        my $pos = $1;
-                        next unless $repohash{$pkg}{$pos};
-                        if ( $pos =~ m{/smedev$} ) {
-                                next unless $repohash{$pkg}{latest};
-                                my @rest = grep { $_ le $repohash{$pkg}{latest} } @{$repohash{$pkg}{$pos}};
-                                if ( @rest ) {
-                                        push @remove, map { $_->filename } @rest;
-                                        $changed{$pos}++;
-                                        @{$repohash{$pkg}{$pos}} = grep { $_ gt $repohash{$pkg}{latest} } @{$repohash{$pkg}{$pos}};
-                                        delete $repohash{$pkg}{$pos};
-                                }
-                        } elsif ( ref($repohash{$pkg}{$pos}) eq 'ARRAY' ) {
-                                my ($latest, @rest) = sort { $b cmp $a } @{$repohash{$pkg}{$pos}};
-                                delete $repohash{$pkg}{$pos};
-                                if ( $repohash{$pkg}{latest} && $repohash{$pkg}{latest} ge $latest ) {
-                                        push @rest, $latest;
-                                } else {
-                                        $repohash{$pkg}{latest} = $latest;
-                                        $repohash{$pkg}{$pos} = $latest;
-                                }
-                                if ( @rest ) {
-                                        push @remove, map { $_->filename } @rest;
-                                        $changed{$pos}++;
-                                }
-                        }
-                }
-        }
-}
-
-print "\n";
-foreach my $pkg ( sort grep { $repohash{$_}{builds} } keys %repohash ) {
-        my %versions = ();
-        foreach my $ver ( sort { $b cmp $a } @{$repohash{$pkg}{builds}} ) {
-                next if $repohash{$pkg}{latest} && $repohash{$pkg}{latest} ge $ver;
-
-                $versions{$ver->tag("VERSION")}++;
-                if ( $versions{$ver->tag("VERSION")} > $releases || (scalar keys %versions) > $releases ) {
-                        foreach my $rpm ( grep { $ver eq $_ } @{$repohash{$pkg}{"$releasedir/$smerel/smedev"}} ) {
-                                push @remove, $rpm->filename;
-                                @{$repohash{$pkg}{"$releasedir/$smerel/smedev"}} = grep { $rpm ne $_ } @{$repohash{$pkg}{"$releasedir/$smerel/smedev"}};
-                                $changed{"$releasedir/$smerel/smedev"}++;
-                        }
-                } else {
-                        print "Possible update " . $ver->filename . "\n" if $repohash{$pkg}{latest};
-                        if ( ! grep { $ver eq $_ } @{$repohash{$pkg}{"$releasedir/$smerel/smedev"}} ) {
-                                push @{$copy{"$releasedir/$smerel/smedev/$arch/RPMS"}}, $ver->filename;
-                                push @{$repohash{$pkg}{"$releasedir/$smerel/smedev"}}, $ver;
-                                $changed{"$releasedir/$smerel/smedev"}++;
-                        }
-                }
-        }
+my @latest;
+foreach my $rpm ( reverse grep { $_->{repo} =~ m{^$releasedir/$smerel/} && $_->{repo} !~ m{/smedev$} } @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 ) {
+			push @{$copy{"$stagedir/RPMS"}}, $rpm->{rpm}->filename;
+			push @rpms, { name => $rpm->{name},
+				      filename => $rpm->{filename},
+				      version => $rpm->{version},
+				      release => $rpm->{release},
+				      repo => $stagedir,
+				      rpm => $rpm->{rpm},
+				      source => $rpm->{source}
+				    };
+		}
+	}
+}
+
+foreach my $rpm ( grep { $_->{repo} eq $stagedir } @rpms )  {
+	$rpm->{repo} = 'deleted' unless grep { $_->{filename} eq $rpm->{filename} } @latest;
+}
+
+my @devel;
+my %versions;
+foreach my $rpm ( grep { $_->{repo} eq 'builds' } @rpms )  {
+	next if grep { $_->{name} eq $rpm->{name} && $_->{rpm} ge $rpm->{rpm} } @latest;
+
+	$versions{$rpm->{name}}{$rpm->{version}}++ unless grep { $_->{name} eq $rpm->{name} && $_->{rpm} eq $rpm->{rpm} } @devel;
+	next if $versions{$rpm->{name}}{$rpm->{version}} > $releases || scalar keys %{$versions{$rpm->{name}}} > $releases;
+	print "Possible update " . $rpm->{rpm}->filename . "\n" if grep { $_->{name} eq $rpm->{name} } @latest;
+
+	push @devel, $rpm;
+	unless ( grep { $_->{repo} =~ m{/smedev$} && $_->{filename} eq $rpm->{filename} } @rpms ) {
+		push @{$copy{"$releasedir/$smerel/smedev/$arch/RPMS"}}, $rpm->{rpm}->filename;
+		$changed{"$releasedir/$smerel/smedev"}++;
+		push @rpms, { name => $rpm->{name},
+			      filename => $rpm->{filename},
+			      version => $rpm->{version},
+			      release => $rpm->{release},
+			      repo => "$releasedir/$smerel/smedev",
+			      rpm => $rpm->{rpm},
+			      source => $rpm->{source}
+			    };
+	}
 }
 
-foreach my $pkg ( grep { $repohash{$_}{"$releasedir/$smerel/smedev"} } keys %repohash ) {
-        foreach my $rpm ( @{$repohash{$pkg}{"$releasedir/$smerel/smedev"}} ) {
-                unless ( grep { $rpm eq $_ } @{$repohash{$pkg}{builds}} ) {
-                        push @remove, $rpm->filename;
-                        @{$repohash{$pkg}{"$releasedir/$smerel/smedev"}} = grep { $rpm ne $_ } @{$repohash{$pkg}{"$releasedir/$smerel/smedev"}};
-                        $changed{"$releasedir/$smerel/smedev"}++;
-                }
-        }
+foreach my $rpm ( grep { $_->{repo} =~ m{/smedev$} } @rpms )  {
+	$rpm->{repo} = 'deleted' unless grep { $_->{filename} eq $rpm->{filename} } @devel;
 }
 
 print "\n";
-foreach my $repo ( sort keys %srcrepohash ) {
-        foreach my $pkg ( sort grep { $repohash{$_}{$repo} } keys %repohash ) {
-                my @rpms = ref($repohash{$pkg}{$repo}) eq "ARRAY" ? @{$repohash{$pkg}{$repo}} : ($repohash{$pkg}{$repo});
-                foreach my $rpm ( sort @rpms ) {
-                        my $src;
-
-                        my @sources = ();
-                        push @sources, ($src = $rpm->tag("SOURCERPM"));
-                        push @sources, $src if (($src = $rpm->tag("SOURCERPM")) =~ s/\.el\d\.rf\./\.rf\./);
-                        push @sources, $src if (($src = $rpm->tag("SOURCERPM")) =~ s/\.[0-3]\.el\d+\.rf\./\.rf\./);
-                        push @sources, $src if (($src = $rpm->tag("SOURCERPM")) =~ s/\.(el|fc)\d\.at//);
-                        push @sources, $src if (($src = $rpm->tag("SOURCERPM")) =~ s/\.at//);
-                        push @sources, $src if (($src = $rpm->tag("SOURCERPM")) =~ s/\.(el|fc)\d//);
-                        push @sources, $src if (($src = $rpm->tag("SOURCERPM")) =~ s/\.\d+\.(el|fc)\d//);
-			$src = $rpm->tag("SOURCERPM");
-
-                        my $found = 0;
-                        foreach my $source ( @sources ) {
-                                if ( $sources{$source} ) {
-                                        unless ( -f "$repo/SRPMS/$source" ) {
-                                                push @{$copy{"$repo/SRPMS"}}, "$sources{$source}/$source";
-                                                $changed{$repo}++;
-                                        }
-                                        $srcrepohash{$repo}{$source}++;
-                                        $found++;
-                                        last;
-                                } elsif ( -f "$repo/SRPMS/$source" ) {
-                                        print "Found missing source $repo/SRPMS/$source for ".$rpm->as_nvre()."\n";
-                                        $srcrepohash{$repo}{$source}++;
-                                        $found++;
-                                }
-                        }
-                        print "Can't find source for ".$rpm->as_nvre()."\n" unless $found;
-                }
-        }
+foreach my $rpm ( grep { $_->{repo} !~ m{^(builds|deleted)$} } @rpms ) {
+	my $src;
+	my $srpm = $rpm->{rpm}->tag("SOURCERPM");
+
+	my @sources = ();
+	push @sources, ($src = $srpm);
+	push @sources, $src if (($src = $srpm) =~ s/\.el\d\.rf\./\.rf\./);
+	push @sources, $src if (($src = $srpm) =~ s/\.[0-3]\.el\d+\.rf\./\.rf\./);
+	push @sources, $src if (($src = $srpm) =~ s/\.(el|fc)\d\.at//);
+	push @sources, $src if (($src = $srpm) =~ s/\.at//);
+	push @sources, $src if (($src = $srpm) =~ s/\.(el|fc)\d//);
+	push @sources, $src if (($src = $srpm) =~ s/\.\d+\.(el|fc)\d//);
+
+	my $found = 0;
+	my $repo = $rpm->{repo};
+	foreach my $source ( @sources ) {
+		if ( $sources{$source} ) {
+			unless ( -f "$repo/SRPMS/$source" ) {
+				push @{$copy{"$repo/SRPMS"}}, "$sources{$source}/$source";
+				$changed{$repo}++ unless $repo eq $stagedir;
+			}
+			$srpms{$repo}{$source}++;
+			$found++;
+			last;
+		}
+	}
+	print "Can't find source for ".$rpm->{rpm}->filename."\n" unless $found;
+}
 
-        foreach my $rpm ( keys %{$srcrepohash{$repo}} ) {
-                unless ( $srcrepohash{$repo}{$rpm} ) {
-                        push @remove, "$repo/SRPMS/$rpm";
-                        $changed{$repo}++;
-                }
-        }
+my @remove;
+foreach my $repo ( keys %srpms ) {
+	foreach my $rpm ( keys %{$srpms{$repo}} ) {
+		unless ( $srpms{$repo}{$rpm} ) {
+			push @remove, "$repo/SRPMS/$rpm";
+			$changed{$repo}++ unless $repo eq $stagedir;
+		}
+	}
 }
 
 print "\n";
 foreach my $repo ( sort keys %copy ) {
-        foreach my $rpm ( sort keys %{{ map { $_ => 1 } @{$copy{$repo}} }} ) {
+        foreach my $rpm ( @{$copy{$repo}} ) {
                 print "copying $rpm to $repo/\n";
                 system(qw(cp --preserve=timestamps), $rpm, "$repo/");
         }
 }
 
 print "\n";
-foreach my $rpm ( sort keys %{{ map { $_ => 1 } @remove }} ) {
+foreach my $rpm ( @remove, map { $_->{rpm}->filename } grep { $_->{repo} eq 'deleted' } @rpms ) {
         print "removing $rpm\n";
         unlink $rpm;
 }
 
 print "\n";
 foreach my $repo ( sort keys %changed ) {
-        next if $repo =~ m{^$stagedir};
-
 	my $dir=`readlink -f $repo/$arch`;
 	chomp $dir;
         print "rebuilding $dir...\n";
         system(qw(createrepo), "$dir");
         system(qw(repoview), "$dir");
 }
-