--- builds_bin/update_repos	2007/11/08 17:12:31	1.26
+++ builds_bin/update_repos	2007/11/08 19:19:26	1.27
@@ -21,40 +21,43 @@ $| = 1;
 
 my @archs = ( 'i386', 'x86_64' );
 
-my $repos = { 'smeos'              => { prio => 17, inc => 1, ver => 1, rel => 1, os => 1 },
-	      'smeupdates'         => { prio => 16, inc => 1, ver => 1, rel => 1 },
-	      'smeupdates-testing' => { prio => 15, inc => 1, ver => 1, rel => 1 },
-	      'smeextras'          => { prio => 14, inc => 0, ver => 1, rel => 1 },
-	      'smeaddons'          => { prio => 13, inc => 0, ver => 1, rel => 1 },
-	      'smecontribs'        => { prio => 12, inc => 0, ver => 1, rel => 1 },
-	      'smetest'            => { prio => 11, inc => 1, ver => 2, rel => 2, devel => 2 },
-	      'smedev'             => { prio => 10, inc => 0, ver => 2, rel => 2, devel => 1 },
-	      'centos'             => { prio =>  9, inc => 0, ver => 0, rel => 0, base => 1 },
-	      'fedora/epel'        => { prio =>  8, inc => 0, ver => 0, rel => 0, base => 1 },
-	      'fedora/extras'      => { prio =>  7, inc => 0, ver => 0, rel => 0, base => 1 },
-	      'rpmforge'           => { prio =>  6, inc => 0, ver => 0, rel => 0, base => 1 },
-	      'atrpms'             => { prio =>  5, inc => 0, ver => 0, rel => 0, base => 1 },
-	      'fedora/core'        => { prio =>  4, inc => 0, ver => 0, rel => 0, base => 1 },
-	      'base'               => { prio =>  3, inc => 0, ver => 0, rel => 0, base => 1 },
-	      'builds'             => { prio =>  2, inc => 0, ver => 0, rel => 0, builds => 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 => 1 },
+	      '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, contribs => 1 },
+	      'smetest'            => { prio => 12, inc => 1, ver => 2, rel => 2, devel => 2 },
+	      'smedev'             => { prio => 11, inc => 0, ver => 2, rel => 2, devel => 1 },
+	      'centos'             => { prio => 10, inc => 0, ver => 0, rel => 0, orig => 1, base => 1 },
+	      'fedora/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/core'        => { prio =>  5, inc => 0, ver => 0, rel => 0, orig => 1, base => 1 },
+	      'base'               => { prio =>  4, inc => 0, ver => 0, rel => 0, orig => 1, base => 1 },
+	      'builds'             => { prio =>  3, 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 $distrepo = { '7' => { active => 1,
-			  centos => 4,
-			  fedora => 3,
-			  repo   => '/releases/7/',
-			  os     => 'SME/RPMS/',
-			  builds => '/builds/smeserver-7-core/',
-			  stage  => '/stage/7/',
+my $distrepo = { '7' => { active   => 1,
+			  centos   => 4,
+			  fedora   => 3,
+			  repo     => '/releases/7/',
+			  os       => 'SME/RPMS/',
+			  builds   => '/builds/smeserver-7-core/',
+			  contribs => '/builds/smeserver-7-contribs/',
+			  stage    => '/stage/7/',
 			},
-		 '8' => { active => 1,
-			  centos => 5,
-			  fedora => 6,
-			  repo   => '/releases/testing/8/',
-			  os     => 'SME/',
-			  builds => '/builds/smeserver-8-core/',
-			  stage  => '/stage/8/',
+		 '8' => { active   => 1,
+			  centos   => 5,
+			  fedora   => 6,
+			  repo     => '/releases/testing/8/',
+			  os       => 'SME/',
+			  builds   => '/builds/smeserver-8-core/',
+			  contribs => '/builds/smeserver-8-contribs/',
+			  stage    => '/stage/8/',
 			},
 	       };
 
@@ -88,6 +91,7 @@ $opts{r} ||= '';
 
 my ($devel1, $devel2) = sort { $repos->{$a}->{devel} <=> $repos->{$b}->{devel} } grep { $repos->{$_}->{devel} } keys %$repos;
 $devel2 ||= $devel1;
+my ($contribs) = sort { $repos->{$a}->{contribs} <=> $repos->{$b}->{contribs} } grep { $repos->{$_}->{contribs} } keys %$repos;
 my ($stage) = sort { $repos->{$a}->{stage} <=> $repos->{$b}->{stage} } grep { $repos->{$_}->{stage} } keys %$repos;
 
 my ($rel, @rpms, %latest, %sources, $archs, $rebuild, $newline);
@@ -99,7 +103,7 @@ foreach my $smever ( sort { $a <=> $b }
     $rebuild = ();
 
     # Load distro packages
-    find( { wanted => \&loadpkg, no_chdir => 1, follow_fast => 1 },  map { $distrepo->{$smever}->{$_} } ('repo','builds','stage') );
+    find( { wanted => \&loadpkg, no_chdir => 1, follow_fast => 1 },  map { $distrepo->{$smever}->{$_} } ('repo','builds','contribs','stage') );
     printline('white', 0, "Distro (SME Server $rel) packages loaded.\n");
 
     # Load base packages
@@ -143,18 +147,19 @@ foreach my $smever ( sort { $a <=> $b }
 	    }
 
 	    # Move packages from base/builds to correct area
-	    elsif ( rprop($pkg, 'base') || rprop($pkg, 'builds') ) {
-		printline('dark blue', 1, '    - checking base/builds') if $opts{d};
+	    elsif ( rprop($pkg, 'orig') ) {
+		printline('dark blue', 1, '    - checking base/builds/contribs') if $opts{d};
 		my $repo = $names{$pkg->{name}} && $names{$pkg->{name}} > 1 ? $devel2 : $devel1;
+		$repo = $contribs if $pkg->{repo} eq 'contribs';
 		if ( $pkg->{nonbase} ) {
 		    foreach my $up ( @pkgs ) {
-			next if rprop($up, 'builds') || rprop($up, 'base');
+			next if rprop($up, 'orig');
 			next if $up->{name} ne $pkg->{name} || ! $up->{obsolete} || $up->{rpm} ge $pkg->{rpm};
 			$repo = $up->{repo};
 			last;
 		    }
 		} 
-		next if rprop($pkg, 'base') && $repo eq $devel1 && $devel1 ne $devel2;
+		next if rprop($pkg, 'base') && $repo eq $devel1;
 		movepkg($pkg, $repo);
 		%names = names($pkg, @pkgs);
 		$seen{$pkg->{nvra}}++;
@@ -189,7 +194,7 @@ foreach my $smever ( sort { $a <=> $b }
 				tagpkg($cmp, 'inuse');
 				$pkg->{srpm}->{latest}++;
 			    }
-			    if ( $pkg->{repo} eq $cmp->{repo} || rprop($cmp, 'base') || rprop($cmp, 'builds') || ( $cmp->{oldrepo} && $pkg->{repo} eq $cmp->{oldrepo} ) ) {
+			    if ( $pkg->{repo} eq $cmp->{repo} || ( $cmp->{oldrepo} && $pkg->{repo} eq $cmp->{oldrepo} ) || rprop($cmp, 'orig') ) {
 				tagpkg($cmp, 'inuse')
 			    }
 			}
@@ -220,7 +225,7 @@ foreach my $smever ( sort { $a <=> $b }
 				tagpkg($cmp, 'inuse');
 				$pkg->{srpm}->{latest}++;
 			    }
-			    tagpkg($cmp, 'inuse') if $pkg->{repo} eq $cmp->{repo} || rprop($cmp, 'base') || rprop($cmp, 'builds');
+			    tagpkg($cmp, 'inuse') if $pkg->{repo} eq $cmp->{repo} || rprop($cmp, 'orig');
 			}
 		    }
 		} elsif ( $cmp->{rpm} eq $pkg->{rpm} ) {
@@ -232,7 +237,7 @@ foreach my $smever ( sort { $a <=> $b }
 			    $_->{latest}++ foreach grep { $_->{nvra} eq $cmp->{nvra} && $_->{latest} && $_->{done} } @pkgs;
 			    tagpkg($cmp, 'correct', 1);
 			} elsif ( $seen{$cmp->{nvra}} ) {
-			    $orig++ if rprop($cmp, 'base') || rprop($cmp, 'builds');
+			    $orig++ if rprop($cmp, 'orig');
 			    movepkg($cmp, 'delete', 1);
 			} else {
 			    movepkg($cmp, $pkg->{repo}, 1, 1);
@@ -299,10 +304,11 @@ foreach my $smever ( sort { $a <=> $b }
 	    }
 	}
 	finddepth(sub{rmdir}, $distrepo->{$rel}->{builds});
+	finddepth(sub{rmdir}, $distrepo->{$rel}->{contribs});
 	printline('white', 0, "Finished copying/moving.\n");
 
 	foreach my $repo ( sort keys %repochg ) {
-	    next if ! $repos->{$repo} || $repos->{$repo}->{base} || $repos->{$repo}->{builds} || $repos->{$repo}->{stage};
+	    next if ! $repos->{$repo} || $repos->{$repo}->{orig} || $repos->{$repo}->{stage};
 	    foreach my $arch ( @archs ) {
 		my $dir = $distrepo->{$rel}->{repo} . "$repo/$arch";
 		$dir = qx(readlink -f $dir);
@@ -335,8 +341,7 @@ sub names {
     my @rpms = @_;
     return map { $_->{name} => rprop($_, 'inc') ? 2 : 1 } grep { $_->{base} eq $pkg->{base} && 
 								 rprop($_, 'prio') >= rprop($pkg, 'prio') && 
-								 ! rprop($_, 'base') &&
-								 ! rprop($_, 'builds') &&
+								 ! rprop($_, 'orig') &&
 								 ! $_->{rpm}->is_source_package
 							       } @rpms;
 }
@@ -376,15 +381,15 @@ sub movepkg {
     my ($pkg, $repo, $done, $remove) = @_;
     defined $done or $done = 2;
     defined $remove or $remove = 0;
-    $remove = 0 if rprop($pkg, 'base') || rprop($pkg, 'builds');
+    $remove = 0 if rprop($pkg, 'orig');
     $remove = 1 if $repo eq 'delete';
 
-    if ( $repo eq 'delete' && ( rprop($pkg, 'base') || (  rprop($pkg, 'builds') && $done == 1 ) ) ) {
+    if ( $repo eq 'delete' && ( rprop($pkg, 'base') || (  rprop($pkg, 'orig') && $done == 1 ) ) ) {
 	tagpkg($pkg, 'inuse', 1);
     } else {
 	printline('bold magenta', 1, "       - ($repo) ", $pkg->{rpm}->filename) if $opts{d};
 	my $color = 'bold white';
-	$color = 'bold yellow' if rprop($pkg, 'builds');
+	$color = 'bold yellow' if rprop($pkg, 'orig');
 	$color = 'dark green' if $repos->{$repo} && $repos->{$repo}->{devel};
 	$color = 'dark red' if $repo eq 'delete';
 	push @{$pkg->{repos}}, $repo unless $repo eq 'delete';
@@ -412,7 +417,7 @@ sub done {
     $pkg->{done}++;
     delete $pkg->{obsolete} if $pkg->{obsolete};
 
-    if ( $repos->{$pkg->{repo}} && ! rprop($pkg, 'base') && ! rprop($pkg, 'builds') ) {
+    if ( $repos->{$pkg->{repo}} && ! rprop($pkg, 'orig') ) {
 	# FIXME: Nasty hack for comps package
 	if ( $pkg->{name} eq 'comps' ) {
 	    if ( ! $latest{$pkg->{name}.'.'.$pkg->{arch}} || $latest{$pkg->{name}.'.'.$pkg->{arch}}->{rpm} eq $pkg->{rpm} ) { 
@@ -471,12 +476,14 @@ sub loadpkg {
     my $reponame = 'unknown';
     if ( substr($_, 0, length($distrepo->{$rel}->{builds})) eq $distrepo->{$rel}->{builds} ) {
 	$reponame = 'builds';
+    } elsif ( substr($_, 0, length($distrepo->{$rel}->{contribs})) eq $distrepo->{$rel}->{contribs} ) {
+	$reponame = 'contribs';
     } elsif ( substr($_, 0, length($distrepo->{$rel}->{stage})) eq $distrepo->{$rel}->{stage} ) {
 	$reponame = 'stage';
     } elsif ( (dirname $pkg->filename) =~ m{\d/(sme[^/]+)/} ) {
 	$reponame = $1;
     }
-    if ( $nosig && ( ! -f "$HOME/.rpmpass" || $reponame eq 'builds' ) ) {
+    if ( $nosig && ( ! -f "$HOME/.rpmpass" || ! $repos->{$reponame}->{orig} ) ) {
 	printline('bold yellow on_red', 1, ' - ', $pkg->filename, ' (missing signature)');
 	return;
     }