--- builds_bin/update_repos	2010/08/15 16:27:13	1.59
+++ builds_bin/update_repos	2010/11/21 22:10:40	1.60
@@ -76,8 +76,9 @@ my $baserepo = { "~S${repotag}os/~A/$osd
 		 '/mirrors/centos/~C/extras/~A/RPMS/' => 'centos',
 		 '/mirrors/fedora/epel/~C/~A/' => 'epel',
 		 '/mirrors/fedora/epel/testing/~C/~A/' => 'epel',
-		 '/mirrors/rpmforge/dag/redhat/el~C/en/~A/dag/RPMS/' => 'rpmforge',
-		 '/mirrors/rpmforge/dag/source/' => 'rpmforge',
+		 '/mirrors/rpmforge/redhat/el~C/en/~A/dag/RPMS/' => 'rpmforge',
+		 '/mirrors/rpmforge/redhat/el~C/en/~A/extras/RPMS/' => 'rpmforge',
+		 '/mirrors/rpmforge/source/' => 'rpmforge',
 		 '/mirrors/atrpms/el~C-~A/atrpms/stable/' => 'atrpms',
 		 '/mirrors/atrpms/el~C-~A/atrpms/testing/' => 'atrpms',
 		 '/mirrors/atrpms/src/el~C-~A/atrpms/stable/' => 'atrpms',
@@ -92,13 +93,13 @@ if ( $opts{q} ) {
 }
 
 my $skippkg = { '7' => { 'centos'        => { map { $_ => 1 } ( 'horde', 'imp-h3', 'ingo-h3', 'turba-h3' ) },
-			 'epel'          => { map { $_ => 1 } ( 'clamav', 'fping', 'ocsinventory', 'perl-Compress-Bzip2', 'perl-Compress-Raw-Zlib', 'perl-Compress-Raw-Bzip2', 'perl-Crypt-OpenSSL-Bignum', 'perl-Crypt-OpenSSL-Random', 'perl-Crypt-OpenSSL-RSA', 'perl-DateTime', 'perl-Razor-Agent', 'perl-Text-Iconv', 'proftpd' ) },
+			 'epel'          => { map { $_ => 1 } ( 'clamav', 'fping', 'ocsinventory', 'perl-Compress-Bzip2', 'perl-Compress-Raw-Zlib', 'perl-Compress-Raw-Bzip2', 'perl-Crypt-OpenSSL-Bignum', 'perl-Crypt-OpenSSL-Random', 'perl-Crypt-OpenSSL-RSA', 'perl-DateTime', 'perl-Razor-Agent', 'perl-Text-Iconv' ) },
 			 'rpmforge'      => { map { $_ => 1 } ( 'mod_auth_tkt', 'perl-Test-Inline', 'spamassassin' ) },
 			 'atrpms'        => { map { $_ => 1 } ( 'check4updates', 'dovecot', 'trac', 'yum' ) },
 		       },
 		'8' => { 'atrpms'        => { map { $_ => 1 } ( 'gnupg' ) },
 			 'centos'        => { map { $_ => 1 } ( 'horde', 'imp-h3', 'ingo-h3', 'turba-h3' ) },
-			 'epel'          => { map { $_ => 1 } ( 'clamav', 'horde', 'libtalloc', 'libtdb', 'perl-Compress-Bzip2', 'perl-Compress-Raw-Zlib', 'perl-Compress-Raw-Bzip2', 'perl-Crypt-OpenSSL-Bignum', 'perl-Crypt-OpenSSL-Random', 'perl-Crypt-OpenSSL-RSA', 'perl-Razor-Agent', 'proftpd', 'smolt' ) },
+			 'epel'          => { map { $_ => 1 } ( 'clamav', 'horde', 'libtalloc', 'libtdb', 'perl-Compress-Bzip2', 'perl-Compress-Raw-Zlib', 'perl-Compress-Raw-Bzip2', 'perl-Crypt-OpenSSL-Bignum', 'perl-Crypt-OpenSSL-Random', 'perl-Crypt-OpenSSL-RSA', 'perl-Razor-Agent', 'smolt' ) },
 			 'rpmforge'      => { map { $_ => 1 } ( 'libtalloc', 'mod_auth_tkt', 'perl-Test-Inline', 'spamassassin' ) },
 		       },
 	      };
@@ -152,23 +153,37 @@ foreach my $ver ( sort { $a <=> $b } key
 	    next if $pkg->{done};
 
 	    my $tmp = $pkg->{svr};
+	    # srpm transformations to match up binary and source rpms
 	    SRC: {
-		$rpms->{$base}->{vers}->{$tmp} && last SRC;
-		($tmp = $pkg->{svr}) =~ s{\.el\d\.at$}{}                 && $rpms->{$base}->{vers}->{$tmp} && last SRC;
-		($tmp = $pkg->{svr}) =~ s{\.el\d\.at$}{}                 && $rpms->{$base}->{vers}->{$tmp} && last SRC;
-		($tmp = $pkg->{svr}) =~ s{\.el\d(\.rf)$}{$1}             && $rpms->{$base}->{vers}->{$tmp} && last SRC;
-		($tmp = $pkg->{svr}) =~ s{(\.el\d)\.rf$}{$1}             && $rpms->{$base}->{vers}->{$tmp} && last SRC;
-		($tmp = $pkg->{svr}) =~ s{\.el\d\.rf$}{.el5}             && $rpms->{$base}->{vers}->{$tmp} && last SRC;
-		($tmp = $pkg->{svr}) =~ s{(\d+)\.\d+\.el\d(\.rf)$}{$1$2} && $rpms->{$base}->{vers}->{$tmp} && last SRC;
-		($tmp = $pkg->{svr}) =~ s{(\d+)\.\d+(\.rf)$}{$1$2}       && $rpms->{$base}->{vers}->{$tmp} && last SRC;
-		($tmp = $pkg->{svr}) =~ s{\.el\d\.rf$}{.dag}             && $rpms->{$base}->{vers}->{$tmp} && last SRC;
-		($tmp = $pkg->{svr}) =~ s{(\d+)\.\d+\.el\d\.rf$}{$1.dag} && $rpms->{$base}->{vers}->{$tmp} && last SRC;
-		($tmp = $pkg->{svr}) =~ s{\.el\d$}{}                     && $rpms->{$base}->{vers}->{$tmp} && last SRC;
-		($tmp = $pkg->{svr}) =~ s{\.el\d_}{_}                    && $rpms->{$base}->{vers}->{$tmp} && last SRC;
-		($tmp = $pkg->{svr}) =~ s{(-\d+)\.\d+\.el\d$}{$1}        && $rpms->{$base}->{vers}->{$tmp} && last SRC;
-		($tmp = $pkg->{svr}) =~ s{\.centos\d$}{}                 && $rpms->{$base}->{vers}->{$tmp} && last SRC;
-		($tmp = $pkg->{svr}) =~ s{\.at$}{}                       && $rpms->{$base}->{vers}->{$tmp} && last SRC;
-		($tmp = $pkg->{svr}) =~ s{\.el\d\.$disttag$}{}           && $rpms->{$base}->{vers}->{$tmp} && last SRC;
+		# Try to find the name the binary wants (no changes)
+		$rpms->{$base}->{vers}->{$tmp}                       && last SRC;
+
+		# rpmforge (.el4.rf to .rf, with rf,rfb,rft,rfx endings)
+		($tmp = $pkg->{svr}) =~ s{\.el\d(\.rf[btx]?)$}{$1}   && $rpms->{$base}->{vers}->{$tmp} && last SRC;
+		# rpmforge (.el4.rfx to .rf, with rfb,rft,rfx switched to rf) TODO: broken, changing svr?
+		($tmp = $pkg->{svr}) =~ s{\.el\d(\.rf)[btx]$}{$1}    && $rpms->{$base}->{vers}->{$tmp} && last SRC;
+		# rpmforge (.el4.rf to .el5) TODO: remove when no longer needed
+		($tmp = $pkg->{svr}) =~ s{\.el\d\.rf$}{.el5}         && $rpms->{$base}->{vers}->{$tmp} && last SRC;
+		# rpmforge (.2.el4.rf to .rf, minor modification not pushed to source?) TODO: remove when no longer needed
+		($tmp = $pkg->{svr}) =~ s{\.2\.el\d(\.rf)$}{$1}      && $rpms->{$base}->{vers}->{$tmp} && last SRC;
+
+		# atrpms (remove .el4.at)
+		($tmp = $pkg->{svr}) =~ s{\.el\d\.at$}{}             && $rpms->{$base}->{vers}->{$tmp} && last SRC;
+		# atrpms (remove .el4)
+		($tmp = $pkg->{svr}) =~ s{\.el\d$}{}                 && $rpms->{$base}->{vers}->{$tmp} && last SRC;
+		# atrpms (remove .0.el5, minor modification not pushed to source?) TODO: remove when no longer needed
+		($tmp = $pkg->{svr}) =~ s{\.0\.el\d$}{}              && $rpms->{$base}->{vers}->{$tmp} && last SRC;
+
+		# Transformations that we hopefully won't have to use anymore TODO: remove if no issues
+		#($tmp = $pkg->{svr}) =~ s{(\.el\d)\.rf$}{$1}             && $rpms->{$base}->{vers}->{$tmp} && last SRC;
+		#($tmp = $pkg->{svr}) =~ s{(\d+)\.\d+(\.rf)$}{$1$2}       && $rpms->{$base}->{vers}->{$tmp} && last SRC;
+		#($tmp = $pkg->{svr}) =~ s{\.el\d\.rf$}{.dag}             && $rpms->{$base}->{vers}->{$tmp} && last SRC;
+		#($tmp = $pkg->{svr}) =~ s{(\d+)\.\d+\.el\d\.rf$}{$1.dag} && $rpms->{$base}->{vers}->{$tmp} && last SRC;
+		#($tmp = $pkg->{svr}) =~ s{\.el\d_}{_}                    && $rpms->{$base}->{vers}->{$tmp} && last SRC;
+		#($tmp = $pkg->{svr}) =~ s{(-\d+)\.\d+\.el\d$}{$1}        && $rpms->{$base}->{vers}->{$tmp} && last SRC;
+		#($tmp = $pkg->{svr}) =~ s{\.centos\d$}{}                 && $rpms->{$base}->{vers}->{$tmp} && last SRC;
+		#($tmp = $pkg->{svr}) =~ s{\.at$}{}                       && $rpms->{$base}->{vers}->{$tmp} && last SRC;
+		#($tmp = $pkg->{svr}) =~ s{\.el\d\.$disttag$}{            && $rpms->{$base}->{vers}->{$tmp} && last SRC;
 	    }
 	    if ( $rpms->{$base}->{vers}->{$tmp} ) {
 		foreach $tmp ( @{$rpms->{$base}->{vers}->{$tmp}} ) {
@@ -203,6 +218,7 @@ foreach my $ver ( sort { $a <=> $b } key
 			    if ($repos->{$cmp->{repo}}->{stage} ) {
 				if ( $seen{$cmp->{nvra}}->{latest} ) {
 				    $seen{$cmp->{nvra}}->{latest}++;
+				    delete $cmp->{delete} if $cmp->{delete};
 				} else {
 				    $cmp->{delete}++;
 				}
@@ -212,10 +228,17 @@ foreach my $ver ( sort { $a <=> $b } key
 				    my $tag = sprintf '%s%s/%s-%s', $distrepo->{$ver}->{$cmp->{repo}}, $cmp->{name}, $cmp->{ver}, $cmp->{rel};
 				    qx(touch $tag/PUSHED) if ! $opts{t} && -d $tag && ! -f "$tag/PUSHED";
 				}
-			    } elsif ( $cmp->{src} && $reposrc{$cmp->{repo}} ) {
-				$reposrc{$cmp->{repo}}->{srpm} = $cmp;
-			    } elsif ( $seen{$cmp->{nvra}}->{repo} ne $cmp->{repo} ) {
-				$cmp->{delete}++;
+			    } else {
+				if ( $cmp->{src} && $cmp->{delete} && $cmp->{oldrepo} && $reposrc{$cmp->{oldrepo}}) {
+				    $cmp->{repo} = $cmp->{oldrepo};
+				    delete $cmp->{delete};
+				}
+				if ( $cmp->{src} && $reposrc{$cmp->{repo}} ) {
+				    $reposrc{$cmp->{repo}}->{srpm} = $cmp;
+				    $srpm = $cmp if ! $srpm;
+				} elsif ( $seen{$cmp->{nvra}}->{repo} ne $cmp->{repo} ) {
+				    $cmp->{delete}++;
+				}
 			    }
 			}
 		    } elsif ($repos->{$cmp->{repo}}->{stage} ) {
@@ -265,16 +288,16 @@ foreach my $ver ( sort { $a <=> $b } key
 			    $dest = pkgdest($cmp, $devel1, $dest, $rpms->{$base}->{rpms});
 			    $dest = $devel1 if verrel($cmp, $dest, \%counts);
 			    unless ( $cmp->{src} && ! $reposrc{$dest} ) {
-                                if ( $repos->{$dest}->{prio} >= $repos->{$track{repo}}->{prio} && ! verrel($cmp, $dest, \%counts) ) {
-                                    unless ( $repos->{$cmp->{repo}}->{base} ) {
-                                        my $tag = sprintf '%s%s/%s-%s', $distrepo->{$ver}->{$cmp->{repo}}, $cmp->{name}, $cmp->{ver}, $cmp->{rel};
-                                        qx(touch $tag/PUSHED) if ! $opts{t} && -d $tag && ! -f "$tag/PUSHED";
-                                    }
-                                    push @{$cmp->{repos}}, $dest;
-                                    $cmp->{oldrepo} = $cmp->{repo} unless $cmp->{oldrepo};
-                                    $cmp->{repo} = $dest;
-                                    $reposrc{$cmp->{repo}}->{srpm} = $cmp if $cmp->{src};
-                                    $orig{$cmp->{nvra}}++;
+				if ( $repos->{$dest}->{prio} >= $repos->{$track{repo}}->{prio} && ! verrel($cmp, $dest, \%counts) ) {
+				    unless ( $repos->{$cmp->{repo}}->{base} ) {
+					my $tag = sprintf '%s%s/%s-%s', $distrepo->{$ver}->{$cmp->{repo}}, $cmp->{name}, $cmp->{ver}, $cmp->{rel};
+					qx(touch $tag/PUSHED) if ! $opts{t} && -d $tag && ! -f "$tag/PUSHED";
+				    }
+				    push @{$cmp->{repos}}, $dest;
+				    $cmp->{oldrepo} = $cmp->{repo} unless $cmp->{oldrepo};
+				    $cmp->{repo} = $dest;
+				    $reposrc{$cmp->{repo}}->{srpm} = $cmp if $cmp->{src};
+				    $orig{$cmp->{nvra}}++;
 				}
 			    }
 			} else {
@@ -286,10 +309,10 @@ foreach my $ver ( sort { $a <=> $b } key
 		    $pkgs{$cmp->{nvra}}++;
 		    $latest{$cmp->{base}} = $cmp->{svr} if $repos->{$cmp->{repo}}->{inc} && ! $latest{$cmp->{base}};
 		    $reposrc{$cmp->{repo}} = $cmp unless $reposrc{$cmp->{repo}} || $cmp->{src} || $repos->{$cmp->{repo}}->{stage};
-		    unless ( $seen{$cmp->{nvra}} ) {
-			$seen{$cmp->{nvra}} = $cmp;
-			$cmp->{latest}++ if $latest{$cmp->{base}} && $cmp->{svr} eq $latest{$cmp->{base}} && $repos->{$cmp->{repo}}->{inc};
+		    if ( $latest{$cmp->{base}} && $cmp->{svr} eq $latest{$cmp->{base}} && $repos->{$cmp->{repo}}->{inc} ) {
+			$cmp->{latest}++ if ! $seen{$cmp->{nvra}} || $cmp->{src};
 		    }
+		    $seen{$cmp->{nvra}} = $cmp unless $seen{$cmp->{nvra}};
 		    push @{$acnt->{$cmp->{repo}}->{$cmp->{rpm}->as_nvre}->{$cmp->{src} ? 'src' : $cmp->{rpm}->arch}}, $cmp;
 		}
 		$cmp->{done}++;
@@ -419,22 +442,25 @@ foreach my $ver ( sort { $a <=> $b } key
 	    chomp $dir;
 	    print "rebuild $repo/$arch\n";
 	    unless ( $opts{t} ) {
-                if ( $dir =~ m{test/|-testing/} ) {
-                    if ( -f "$dir/repodata/comps.xml" ) {
-                        qx(createrepo --update --database --exclude *smeserver-release*.rpm --exclude *.src.rpm --exclude *-debuginfo-*.rpm --groupfile repodata/comps.xml $dir);
-                    } else {
-                        qx(createrepo --update --database --exclude *smeserver-release*.rpm --exclude *.src.rpm --exclude *-debuginfo-*.rpm $dir);
-                    }
-                } else {
-                    if ( -f "$dir/repodata/comps.xml" ) {
-                        qx(createrepo --update --database --exclude *.src.rpm --exclude *-debuginfo-*.rpm --groupfile repodata/comps.xml $dir);
-                    } else {
-                        qx(createrepo --update --database --exclude *.src.rpm --exclude *-debuginfo-*.rpm $dir);
-                    }
-                }
+		if ( $dir =~ m{test/|-testing/} ) {
+		    if ( -f "$dir/repodata/comps.xml" ) {
+			qx(createrepo --update --database --exclude *smeserver-release*.rpm --exclude *.src.rpm --exclude *-debuginfo-*.rpm --groupfile repodata/comps.xml $dir);
+		    } else {
+			qx(createrepo --update --database --exclude *smeserver-release*.rpm --exclude *.src.rpm --exclude *-debuginfo-*.rpm $dir);
+		    }
+		} else {
+		    if ( -f "$dir/repodata/comps.xml" ) {
+			qx(createrepo --update --database --exclude *.src.rpm --exclude *-debuginfo-*.rpm --groupfile repodata/comps.xml $dir);
+		    } else {
+			qx(createrepo --update --database --exclude *.src.rpm --exclude *-debuginfo-*.rpm $dir);
+		    }
+		}
 		qx(repoview $dir);
 		qx(rm -rf $dir/.olddata) if -d "$dir/.olddata";
 		qx(rm -rf $dir/.repodata) if -d "$dir/.repodata";
+		qx(rm -rf $dir/repodata/index.html) if -f "$dir/repodata/index.html";
+		qx(rm -rf $dir/repodata/update-info) if -d "$dir/repodata/update-info";
+		qx(rm -rf $dir/repodata/repoview) if -d "$dir/repodata/repoview";
 	    }
 	}
     }