--- builds_bin/update_repos	2009/10/26 22:02:53	1.51
+++ builds_bin/update_repos	2009/12/01 16:17:48	1.52
@@ -20,6 +20,10 @@ $opts{r} ||= '';
 my $rpm_flags = RPM2->vsf_nosha1header | RPM2->vsf_nomd5header | RPM2->vsf_nodsaheader | RPM2->vsf_norsaheader;
 $rpm_flags |= RPM2->vsf_nosha1 | RPM2->vsf_nomd5 | RPM2->vsf_nodsa | RPM2->vsf_norsa;
 
+my $osdir = 'SME';
+my $disttag = 'sme';
+my $repotag = 'sme';
+
 my @archs = ( 'i386', 'x86_64' );
 
 my $distrepo = { '7' => { active   => 1,
@@ -42,34 +46,34 @@ my $distrepo = { '7' => { active   => 1,
 			},
 	       };
 
-my $repos = { 'smeos'              => { prio => 18, inc => 1, ver => 1, rel => 1, os => 1 },
-	      'smeupdates'         => { prio => 17, inc => 1, ver => 1, rel => 1 },
-	      'smeupdates-testing' => { prio => 16, inc => 1, ver => 1, rel => 3 },
-	      'smeextras'          => { prio => 15, inc => 0, ver => 1, rel => 1 },
-	      'smeaddons'          => { prio => 14, inc => 0, ver => 1, rel => 1 },
-	      'smecontribs'        => { prio => 13, inc => 0, ver => 1, rel => 1 },
-	      'smetest'            => { prio => 12, inc => 0, ver => 2, rel => 3, devel => 2 },
-	      'smedev'             => { 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 },
-	      'contribs'           => { prio =>  2, inc => 0, ver => 0, rel => 0, orig => 1 },
-	      'stage'              => { prio =>  1, inc => 0, ver => 0, rel => 0, stage => 1, os => 1 },
+my $repos = { "${repotag}os"              => { prio => 18, inc => 1, ver => 1, rel => 1, os => 1 },
+	      "${repotag}updates"         => { prio => 17, inc => 1, ver => 1, rel => 1 },
+	      "${repotag}updates-testing" => { prio => 16, inc => 1, ver => 1, rel => 3 },
+	      "${repotag}extras"          => { prio => 15, inc => 0, ver => 1, rel => 1 },
+	      "${repotag}addons"          => { prio => 14, inc => 0, ver => 1, rel => 1 },
+	      "${repotag}contribs"        => { prio => 13, inc => 0, ver => 1, rel => 1 },
+	      "${repotag}test"            => { prio => 12, inc => 0, ver => 2, rel => 3, devel => 2 },
+	      "${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 },
+	      'contribs'                  => { prio =>  2, inc => 0, ver => 0, rel => 0, orig => 1 },
+	      'stage'                     => { prio =>  1, inc => 0, ver => 0, rel => 0, stage => 1, os => 1 },
 	    };
 
-my $baserepo = { '~Ssmeos/~A/SME/~O' => 'smeos',
-		 '~Ssmeupdates/~A/RPMS/' => 'smeupdates',
-		 '~Ssmeupdates-testing/~A/RPMS/' => 'smeupdates-testing',
-		 '~Ssmeextras/~A/RPMS/' => 'smeextras',
-		 '~Ssmeaddons/~A/RPMS/' => 'smeaddons',
-		 '~Ssmecontribs/~A/RPMS/' => 'smecontribs',
-		 '~Ssmetest/~A/RPMS/' => 'smetest',
-		 '~Ssmedev/~A/RPMS/' => 'smedev',
-		 '/stage/~s/~A/SME/~O' => 'stage',
+my $baserepo = { "~S${repotag}os/~A/$osdir/~O" => "${repotag}os",
+		 "~S${repotag}updates/~A/RPMS/" => "${repotag}updates",
+		 "~S${repotag}updates-testing/~A/RPMS/" => "${repotag}updates-testing",
+		 "~S${repotag}extras/~A/RPMS/" => "${repotag}extras",
+		 "~S${repotag}addons/~A/RPMS/" => "${repotag}addons",
+		 "~S${repotag}contribs/~A/RPMS/" => "${repotag}contribs",
+		 "~S${repotag}test/~A/RPMS/" => "${repotag}test",
+		 "~S${repotag}dev/~A/RPMS/" => "${repotag}dev",
+		 "/stage/~s/~A/$osdir/~O" => 'stage',
 		 '/mirrors/centos/~C/fasttrack/~A/RPMS/' => 'centos',
 		 '/mirrors/centos/~C/updates/~A/RPMS/' => 'centos',
 		 '/mirrors/centos/~C/os/~A/CentOS/~O' => 'centos',
@@ -113,8 +117,8 @@ my ($devel1, $devel2) = sort { $repos->{
 $devel2 ||= $devel1;
 
 my ($rpms, %base, %latest, %sources);
-foreach my $smever ( sort { $a <=> $b } keys %$distrepo ) {
-    next unless $distrepo->{$smever}->{active};
+foreach my $ver ( sort { $a <=> $b } keys %$distrepo ) {
+    next unless $distrepo->{$ver}->{active};
     my %repochg = ();
     $rpms = ();
     %latest = ();
@@ -123,11 +127,11 @@ foreach my $smever ( sort { $a <=> $b }
 
     foreach my $dir  ( sort { $repos->{$baserepo->{$b}}->{prio} <=> $repos->{$baserepo->{$a}}->{prio} || $a cmp $b } keys %$baserepo ) {
 	my $bdir = $dir;
-	$bdir =~ s/~O/$distrepo->{$smever}->{os}/;
-	$bdir =~ s/~S/$distrepo->{$smever}->{repo}/;
-	$bdir =~ s/~s/$smever/;
-	$bdir =~ s/~C/$distrepo->{$smever}->{centos}/;
-	$bdir =~ s/~F/$distrepo->{$smever}->{fedora}/;
+	$bdir =~ s/~O/$distrepo->{$ver}->{os}/;
+	$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/' ) {
@@ -137,13 +141,13 @@ foreach my $smever ( sort { $a <=> $b }
 	    }
 	    opendir DIR, $adir or next;
 	    next unless -d $adir;
-	    process_rpm("$adir$_", $smever, $baserepo->{$dir}) foreach readdir DIR;
+	    process_rpm("$adir$_", $ver, $baserepo->{$dir}) foreach readdir DIR;
 	    closedir DIR;
 	    last unless $dir =~ m{~A};
 	}
     }
-    find( { wanted => sub { process_rpm($_, $smever, 'builds'); }, no_chdir => 1, follow_fast => 1 }, $distrepo->{$smever}->{'builds'} );
-    find( { wanted => sub { process_rpm($_, $smever, 'contribs'); }, no_chdir => 1, follow_fast => 1 }, $distrepo->{$smever}->{'contribs'} );
+    find( { wanted => sub { process_rpm($_, $ver, 'builds'); }, no_chdir => 1, follow_fast => 1 }, $distrepo->{$ver}->{'builds'} );
+    find( { wanted => sub { process_rpm($_, $ver, 'contribs'); }, no_chdir => 1, follow_fast => 1 }, $distrepo->{$ver}->{'contribs'} );
 
     foreach my $base ( sort keys %$rpms ) {
 	next unless $rpms->{$base}->{rpms};
@@ -163,13 +167,14 @@ foreach my $smever ( sort { $a <=> $b }
 		($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{(\d+)\.\d+\.el\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{\.el\d\.sme$}{}                && $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}} ) {
@@ -210,7 +215,7 @@ foreach my $smever ( sort { $a <=> $b }
 			    } elsif ( $repos->{$cmp->{repo}}->{orig}) {
 				$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};
+				    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}} ) {
@@ -231,7 +236,7 @@ foreach my $smever ( sort { $a <=> $b }
 			    if ( $repos->{$cmp->{repo}}->{orig} ) {
 				$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};
+				    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}} ) {
@@ -269,7 +274,7 @@ foreach my $smever ( sort { $a <=> $b }
 				$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};
+				    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;
@@ -307,9 +312,9 @@ foreach my $smever ( sort { $a <=> $b }
 		    }
 		}
 	    } elsif ( scalar keys %pkgs && $opts{s} ) {
-		print "\n * missing source (sme$smever, ", $pkg->{repo}, ", ", $pkg->{svr}, ")\n";
+		print "\n * missing source ($disttag$ver, ", $pkg->{repo}, ", ", $pkg->{svr}, ")\n";
 	    }
-	    print "\n * missing originals (sme$smever, ", $pkg->{repo}, ", ", $pkg->{svr}, ")\n" if $opts{o} && scalar keys %orig != scalar keys %pkgs;
+	    print "\n * missing originals ($disttag$ver, ", $pkg->{repo}, ", ", $pkg->{svr}, ")\n" if $opts{o} && scalar keys %orig != scalar keys %pkgs;
 	}
 
 	foreach my $r ( keys %$acnt ) {
@@ -335,7 +340,7 @@ foreach my $smever ( sort { $a <=> $b }
 		push @{$pkg->{repos}}, $stage;
 	    }
 	    if ( ! $print && ($pkg->{delete} || $pkg->{repos} || $pkg->{nosig} ) ) {
-		print "\n$base (sme$smever)\n", "=" x length("$base (sme$smever)"), "\n";
+		print "\n$base ($disttag$ver)\n", "=" x length("$base ($disttag$ver)"), "\n";
 		$print++;
 	    }
 
@@ -366,9 +371,9 @@ foreach my $smever ( sort { $a <=> $b }
 		    $pkg->{oldrepo} = $repo unless $pkg->{oldrepo} eq ${$pkg->{repos}}[0];
 
 		    my @d = ();
-		    my $head = $distrepo->{$smever}->{repo} . $repo . '/';
-		    $head = $distrepo->{$smever}->{stage} if $repos->{$repo}->{stage};
-		    my $tail = $repos->{$repo}->{os} ? 'SME/' . $distrepo->{$smever}->{os} : 'RPMS/';
+		    my $head = $distrepo->{$ver}->{repo} . $repo . '/';
+		    $head = $distrepo->{$ver}->{stage} if $repos->{$repo}->{stage};
+		    my $tail = $repos->{$repo}->{os} ? "$osdir/" . $distrepo->{$ver}->{os} : 'RPMS/';
 		    if ( $pkg->{src} ) {
 			push @d, "${head}SRPMS/" . basename($pkg->{rpm}->filename);
 		    } elsif ( $pkg->{rpm}->arch eq 'noarch' ) {
@@ -389,7 +394,7 @@ foreach my $smever ( sort { $a <=> $b }
 		qx(rm -f $src) unless $opts{t};
 		$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};
+		    my $tag = sprintf '%s%s/%s-%s', $distrepo->{$ver}->{$pkg->{repo}}, $pkg->{name}, $pkg->{ver}, $pkg->{rel};
 		    qx(rm -f $tag/PUSHED) if ! $opts{t} && -d $tag && -f "$tag/PUSHED";
 		}
 	    }
@@ -397,12 +402,12 @@ foreach my $smever ( sort { $a <=> $b }
     }
 
     if ( %repochg ) {
-	print "\nrebuild repo (sme$smever)\n", "=" x length("rebuild repo (sme$smever)"), "\n";
+	print "\nrebuild repo ($disttag$ver)\n", "=" x length("rebuild repo ($disttag$ver)"), "\n";
     }
     foreach my $repo ( sort { $repos->{$b}->{prio} <=> $repos->{$a}->{prio} } keys %repochg ) {
 	next if $repos->{$repo}->{orig} || $repos->{$repo}->{stage};
 	foreach my $arch ( @archs ) {
-	    my $dir = $distrepo->{$smever}->{repo} . "$repo/$arch";
+	    my $dir = $distrepo->{$ver}->{repo} . "$repo/$arch";
 	    $dir = qx(readlink -f $dir);
 	    chomp $dir;
 	    print "rebuild $repo/$arch\n";
@@ -419,7 +424,7 @@ foreach my $smever ( sort { $a <=> $b }
 	}
     }
     unless ( $opts{t} ) {
-	finddepth(sub{rmdir}, $distrepo->{$smever}->{$_}) foreach ('builds','contribs');
+	finddepth(sub{rmdir}, $distrepo->{$ver}->{$_}) foreach ('builds','contribs');
     }
 }
 
@@ -456,7 +461,7 @@ sub pkgdest {
 
 sub process_rpm {
     my $rpm = shift;
-    my $smever = shift;
+    my $ver = shift;
     my $repo = shift;
     return unless $rpm =~ m{/([^/]*)-[^-]+-[^-]+\.\w+\.rpm$};
     my $base = $1;
@@ -475,7 +480,7 @@ sub process_rpm {
 	return if $repos->{$cmp->{repo}}->{base} && $repos->{$cmp->{repo}}->{prio} > $repos->{$repo}->{prio} && $pkg ge $cmp->{rpm};
     }
     my ($src, $version, $release) = ($pkg->is_source_package ? $pkg->filename : $pkg->sourcerpm) =~ m{(?:^|/)([^/]*)-([^-]+)-([^-]+)\.\w+\.rpm$};
-    return if $skippkg->{$smever}->{$repo} && ( $skippkg->{$smever}->{$repo}->{$src} || $skippkg->{$smever}->{$repo}->{$pkg->name} );
+    return if $skippkg->{$ver}->{$repo} && ( $skippkg->{$ver}->{$repo}->{$src} || $skippkg->{$ver}->{$repo}->{$pkg->name} );
     return if $repos->{$repo}->{base} && $nosig;
     if ( $nosig && ! -f "$HOME/.rpmpass" ) { print " * missing signature (" .$pkg->filename . ")\n"; return; }
     my $arch = 'unknown';