--- builds_bin/update_repos	2008/03/28 03:33:43	1.43
+++ builds_bin/update_repos	2008/07/26 21:51:03	1.47
@@ -95,14 +95,14 @@ if ( $opts{q} ) {
 }
 
 my $skippkg = { '7' => { 'centos'        => { map { $_ => 1 } ( 'horde', 'imp-h3', 'ingo-h3', 'turba-h3', 'vim' ) },
-			 'epel'          => { map { $_ => 1 } ( 'clamav', 'fping', 'perl-Razor-Agent', 'perl-Text-Iconv', 'proftpd' ) },
+			 'epel'          => { map { $_ => 1 } ( 'clamav', 'fping', 'perl-Crypt-OpenSSL-Bignum', 'perl-Crypt-OpenSSL-Random', 'perl-Crypt-OpenSSL-RSA', 'perl-Razor-Agent', 'perl-Text-Iconv', 'proftpd' ) },
 			 'rpmforge'      => { map { $_ => 1 } ( 'perl-Test-Inline' ) },
 			 'atrpms'        => { map { $_ => 1 } ( 'check4updates', 'dovecot', 'trac', 'yum' ) },
 		       },
 		'8' => { 'centos'        => { map { $_ => 1 } ( 'horde', 'imp-h3', 'ingo-h3', 'turba-h3' ) },
 			 'fedora'        => { map { $_ => 1 } ( 'kernel-xen' ) },
-			 'epel'          => { map { $_ => 1 } ( 'clamav', 'perl-Razor-Agent', 'proftpd', 'smolt' ) },
-			 'fedora-extras' => { map { $_ => 1 } ( 'dstat', 'gocr', 'horde', 'oidentd', 'perl-Test-Inline', 'perl-Razor-Agent', 'smolt' ) },
+			 'epel'          => { map { $_ => 1 } ( 'clamav', 'horde', '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-Crypt-OpenSSL-Bignum', 'perl-Crypt-OpenSSL-Random', 'perl-Crypt-OpenSSL-RSA', 'perl-Test-Inline', 'perl-Razor-Agent', 'smolt' ) },
 			 'rpmforge'      => { map { $_ => 1 } ( 'perl-Test-Inline' ) },
 		       },
 	      };
@@ -210,7 +210,7 @@ foreach my $smever ( sort { $a <=> $b }
 				$orig{$cmp->{nvra}}++;
 				unless ( $repos->{$cmp->{repo}}->{base} ) {
 				    my $tag = sprintf '%s%s/%s-%s', $distrepo->{$smever}->{$cmp->{repo}}, $cmp->{name}, $cmp->{ver}, $cmp->{rel};
-				    qx(touch $tag/PUSHED) if -d $tag && ! -f "$tag/PUSHED";
+				    qx(touch $tag/PUSHED) if ! $opts{t} && -d $tag && ! -f "$tag/PUSHED";
 				}
 			    } elsif ( $cmp->{src} && $reposrc{$cmp->{repo}} ) {
 				$reposrc{$cmp->{repo}}->{srpm} = $cmp;
@@ -231,7 +231,7 @@ foreach my $smever ( sort { $a <=> $b }
 				$orig{$cmp->{nvra}}++;
 				unless ( $repos->{$cmp->{repo}}->{base} ) {
 				    my $tag = sprintf '%s%s/%s-%s', $distrepo->{$smever}->{$cmp->{repo}}, $cmp->{name}, $cmp->{ver}, $cmp->{rel};
-				    qx(touch $tag/PUSHED) if -d $tag && ! -f "$tag/PUSHED";
+				    qx(touch $tag/PUSHED) if ! $opts{t} && -d $tag && ! -f "$tag/PUSHED";
 				}
 			    } elsif ( $cmp->{src} && $reposrc{$cmp->{repo}} ) {
 				$reposrc{$cmp->{repo}}->{srpm} = $cmp;
@@ -267,16 +267,15 @@ foreach my $smever ( sort { $a <=> $b }
 			    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->{$smever}->{$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}}++;
-				unless ( $repos->{$cmp->{repo}}->{base} ) {
-				    my $tag = sprintf '%s%s/%s-%s', $distrepo->{$smever}->{$cmp->{repo}}, $cmp->{name}, $cmp->{ver}, $cmp->{rel};
-				    qx(touch $tag/PUSHED) if -d $tag && ! -f "$tag/PUSHED";
-				}
 			    } else {
 				$cmp->{delete}++;
 			    }
@@ -390,7 +389,7 @@ foreach my $smever ( sort { $a <=> $b }
 		$repochg{$pkg->{repo}}++ unless $repos->{$pkg->{repo}}->{base} || $repos->{$pkg->{repo}}->{stage};
 		if ( $repos->{$pkg->{repo}}->{orig} && ! $repos->{$pkg->{repo}}->{base} ) {
 		    my $tag = sprintf '%s%s/%s-%s', $distrepo->{$smever}->{$pkg->{repo}}, $pkg->{name}, $pkg->{ver}, $pkg->{rel};
-		    qx(rm -f $tag/PUSHED) if -d $tag && -f "$tag/PUSHED";
+		    qx(rm -f $tag/PUSHED) if ! $opts{t} && -d $tag && -f "$tag/PUSHED";
 		}
 	    }
 	}
@@ -408,9 +407,9 @@ foreach my $smever ( sort { $a <=> $b }
 	    print "rebuild $repo/$arch\n";
 	    unless ( $opts{t} ) {
 		if ( -f "$dir/repodata/comps.xml" ) {
-		    qx(createrepo -g repodata/comps.xml $dir);
+		    qx(createrepo --update --database --groupfile repodata/comps.xml $dir);
 		} else {
-		    qx(createrepo $dir);
+		    qx(createrepo --update --database $dir);
 		}
 		qx(repoview $dir);
 		qx(rm -rf $dir/.olddata) if -d "$dir/.olddata";