--- builds_bin/update_repos	2010/02/12 18:52:06	1.53
+++ builds_bin/update_repos	2010/08/15 16:27:13	1.59
@@ -28,7 +28,6 @@ my @archs = ( 'i386', 'x86_64' );
 
 my $distrepo = { '7' => { active    => 1,
 			  centos    => 4,
-			  fedora    => 3,
 			  repo      => '/releases/7/',
 			  os        => 'RPMS/',
 			  builds    => '/builds/smeserver-7-core/',
@@ -37,7 +36,6 @@ my $distrepo = { '7' => { active    => 1
 			},
 		 '8' => { active    => 1,
 			  centos    => 5,
-			  fedora    => 6,
 			  repo      => '/releases/testing/8/',
 			  os        => '',
 			  builds    => '/builds/smeserver-8-core/',
@@ -56,10 +54,8 @@ my $repos = { "${repotag}os"
 	      "${repotag}dev"             => { prio => 11, inc => 0, ver => 1, rel => 1, devel => 1 },
 	      'centos'                    => { prio => 10, inc => 0, ver => 0, rel => 0, orig => 1, base => 1 },
 	      'epel'                      => { prio =>  9, inc => 0, ver => 0, rel => 0, orig => 1, base => 1 },
-	      'fedora-extras'             => { prio =>  8, inc => 0, ver => 0, rel => 0, orig => 1, base => 1 },
 	      'rpmforge'                  => { prio =>  7, inc => 0, ver => 0, rel => 0, orig => 1, base => 1 },
 	      'atrpms'                    => { prio =>  6, inc => 0, ver => 0, rel => 0, orig => 1, base => 1 },
-	      'fedora'                    => { prio =>  5, inc => 0, ver => 0, rel => 0, orig => 1, base => 1 },
 	      'builds'                    => { prio =>  4, inc => 0, ver => 0, rel => 0, orig => 1 },
 	      'community'                 => { prio =>  2, inc => 0, ver => 0, rel => 0, orig => 1 },
 	      'stage'                     => { prio =>  1, inc => 0, ver => 0, rel => 0, stage => 1, os => 1 },
@@ -80,15 +76,12 @@ 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/fedora/extras/~F/~A/' => 'fedora-extras',
 		 '/mirrors/rpmforge/dag/redhat/el~C/en/~A/dag/RPMS/' => 'rpmforge',
 		 '/mirrors/rpmforge/dag/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',
 		 '/mirrors/atrpms/src/el~C-~A/atrpms/testing/' => 'atrpms',
-		 '/mirrors/fedora/core/~F/~A/os/Fedora/RPMS/' => 'fedora',
-		 '/mirrors/fedora/core/updates/~F/~A/' => 'fedora',
 	       };
 
 if ( $opts{q} ) {
@@ -100,15 +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' ) },
-			 'fedora-extras' => { map { $_ => 1 } ( 'ddclient', 'hddtemp', 'pam_abl', 'perl-Compress-Bzip2', 'perl-Error', 'perl-HTML-Format', 'perl-MIME-Types', 'perl-Net-IP', 'perl-Archive-Zip', 'perl-Class-Singleton', 'perl-Razor-Agent', 'perl-Test-Inline', 'perl-Text-Autoformat', 'perl-Text-Iconv', 'perl-Text-Reform', 'perl-XML-RSS' ) },
-			 'rpmforge'      => { map { $_ => 1 } ( 'perl-Test-Inline' ) },
+			 'rpmforge'      => { map { $_ => 1 } ( 'mod_auth_tkt', 'perl-Test-Inline', 'spamassassin' ) },
 			 'atrpms'        => { map { $_ => 1 } ( 'check4updates', 'dovecot', 'trac', 'yum' ) },
 		       },
-		'8' => { 'centos'        => { map { $_ => 1 } ( 'horde', 'imp-h3', 'ingo-h3', 'turba-h3' ) },
-			 'fedora'        => { map { $_ => 1 } ( 'kernel', 'kernel-xen', 'libgsf' ) },
-			 'epel'          => { map { $_ => 1 } ( 'clamav', 'horde', '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' ) },
-			 'fedora-extras' => { map { $_ => 1 } ( 'dstat', 'gocr', 'horde', 'oidentd', 'perl-Compress-Bzip2', 'perl-Crypt-OpenSSL-Bignum', 'perl-Crypt-OpenSSL-Random', 'perl-Crypt-OpenSSL-RSA', 'perl-Test-Inline', 'perl-Razor-Agent', 'smolt' ) },
-			 'rpmforge'      => { map { $_ => 1 } ( 'perl-Test-Inline' ) },
+		'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' ) },
+			 'rpmforge'      => { map { $_ => 1 } ( 'libtalloc', 'mod_auth_tkt', 'perl-Test-Inline', 'spamassassin' ) },
 		       },
 	      };
 
@@ -131,11 +122,10 @@ foreach my $ver ( sort { $a <=> $b } key
 	$bdir =~ s/~S/$distrepo->{$ver}->{repo}/;
 	$bdir =~ s/~s/$ver/;
 	$bdir =~ s/~C/$distrepo->{$ver}->{centos}/;
-	$bdir =~ s/~F/$distrepo->{$ver}->{fedora}/;
 	for my $arch ( @archs, 'SRPMS/' ) {
 	    my $adir = $bdir;
 	    if ( $arch eq 'SRPMS/' ) {
-		$adir =~ s/~A.*/$arch/ if $arch eq 'SRPMS/';
+		$adir =~ s/~A.*/$arch/;
 	    } else {
 		$adir =~ s/~A/$arch/;
 	    }
@@ -167,15 +157,18 @@ foreach my $ver ( sort { $a <=> $b } key
 		($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$}{.el5}             && $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{\.el\d\.$disttag$}{}                && $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}} ) {
@@ -271,20 +264,18 @@ foreach my $ver ( sort { $a <=> $b } key
 			    my $dest = $repos->{$track{repo}}->{prio} > $repos->{$devel2}->{prio} ? $track{repo} : $devel2;
 			    $dest = pkgdest($cmp, $devel1, $dest, $rpms->{$base}->{rpms});
 			    $dest = $devel1 if verrel($cmp, $dest, \%counts);
-			    if ( $cmp->{src} && ! $reposrc{$dest} ) {
-				$cmp->{delete}++;
-			    } elsif ( $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";
+			    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}}++;
 				}
-				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 {
-				$cmp->{delete}++;
 			    }
 			} else {
 			    $cmp->{delete}++;
@@ -400,6 +391,21 @@ foreach my $ver ( sort { $a <=> $b } key
 		}
 	    }
 	}
+
+	if ( $rpms->{$base}->{srpms} ) {
+	    foreach my $pkg ( sort { $b->{rpm} cmp $a->{rpm} } @{$rpms->{$base}->{srpms}} ) {
+		next if $pkg->{done} || $repos->{$pkg->{repo}}->{orig} || $repos->{$pkg->{repo}}->{base};
+		$pkg->{delete}++;
+		my $src = $pkg->{rpm}->filename;
+		if ( ! $print && ($pkg->{delete} || $pkg->{repos} || $pkg->{nosig} ) ) {
+		    print "\n$base ($disttag$ver)\n", "=" x length("$base ($disttag$ver)"), "\n";
+		    $print++;
+		}
+		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};
+	    }
+	}
     }
 
     if ( %repochg ) {
@@ -413,11 +419,19 @@ foreach my $ver ( sort { $a <=> $b } key
 	    chomp $dir;
 	    print "rebuild $repo/$arch\n";
 	    unless ( $opts{t} ) {
-		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";