--- builds_bin/update_repos	2007/11/05 03:10:02	1.22
+++ builds_bin/update_repos	2007/11/23 16:45:36	1.29
@@ -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 => 2, contribs => 1 },
+	      'smetest'            => { prio => 12, inc => 0, 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
@@ -128,26 +132,33 @@ foreach my $smever ( sort { $a <=> $b }
 	$archs = ();
 
 	foreach my $pkg ( @pkgs ) {
-	    next if $pkg->{done} || $pkg->{obsolete} || $pkg->{rpm}->is_source_package || ! $repos->{$pkg->{repo}} || rprop($pkg, 'stage');
+	    next if $pkg->{done} || $pkg->{obsolete} || $pkg->{rpm}->is_source_package || ! $repos->{$pkg->{repo}};
 	    printline('bold black', 1, ' - ', $pkg->{rpm}->filename) if $opts{d};
 	    my $orig = 0;
 
 	    # Find names of packages in same or higher repos
 	    my %names = names($pkg, @pkgs);
 
+	    # Stage packages should never be most current
+	    if ( rprop($pkg, 'stage') ) {
+		printline('dark blue', 1, '    - checking stage') if $opts{d};
+		tagpkg($pkg, 'obsolete');
+		next;
+	    }
+
 	    # Move packages from base/builds to correct area
-	    if ( rprop($pkg, 'base') || rprop($pkg, 'builds') ) {
-		printline('dark blue', 1, '    - checking base/builds') if $opts{d};
-		my $repo = $names{$pkg->{name}} && $names{$pkg->{name}} > 1 ? $devel2 : $devel1;
+	    elsif ( rprop($pkg, 'orig') ) {
+		printline('dark blue', 1, '    - checking base/builds/contribs') if $opts{d};
+		my $repo = $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;
 		movepkg($pkg, $repo);
 		%names = names($pkg, @pkgs);
 		$seen{$pkg->{nvra}}++;
@@ -182,7 +193,9 @@ 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');
+			    if ( $pkg->{repo} eq $cmp->{repo} || ( $cmp->{oldrepo} && $pkg->{repo} eq $cmp->{oldrepo} ) || rprop($cmp, 'orig') ) {
+				tagpkg($cmp, 'inuse')
+			    }
 			}
 			next if $pkg->{srpm} && $pkg->{srpm}->{rpm} eq $pkg->{rpm};
 
@@ -211,7 +224,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} ) {
@@ -223,11 +236,13 @@ 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);
-			    $seen{$cmp->{nvra}}++;
+			    unless ( $pkg->{repo} eq $devel1 && $devel1 ne $devel2 && $names{$cmp->{name}} > 1 ) {
+				movepkg($cmp, $pkg->{repo}, 1, 1);
+				$seen{$cmp->{nvra}}++;
+			    }
 			}
 		    } else {
 			tagpkg($cmp, 'nonbase');
@@ -239,7 +254,7 @@ foreach my $smever ( sort { $a <=> $b }
 	    printline('dark blue', 1, '    - checking source packages') if $opts{d};
 	    if ( ! $pkg->{srpm} ) {
 		printline('bold yellow on_red', 1, ' - ', $pkg->{rpm}->filename, ' (missing source ', $pkg->{rpm}->sourcerpm, ')');
-	    } elsif ( $pkg->{srpm}->{repo} ne $pkg->{repo} ) {
+	    } elsif ( $pkg->{srpm}->{repo} ne $pkg->{repo} && ( ! $pkg->{srpm}->{oldrepo} || $pkg->{srpm}->{oldrepo} ne $pkg->{repo} ) ) {
 		movepkg($pkg->{srpm}, $pkg->{repo}, 0);
 	    }
 	    unless ( $orig ) {
@@ -248,12 +263,6 @@ foreach my $smever ( sort { $a <=> $b }
 		}
 	    }
 	}
-	printline('bold black', 1, ' - missing stage packages') if $opts{d};
-	movepkg($_, $stage, 0) foreach grep { $_->{latest} && $_->{latest} == 1 } @pkgs;
-
-	printline('bold black', 1, ' - obsolete packages') if $opts{d};
-	movepkg($_, 'delete') foreach grep { ! rprop($_, 'base') && ! $_->{done} && ( $_->{obsolete} || ( $_->{rpm}->is_source_package && ! $_->{inuse} ) ) } @pkgs;
-
 	printline('bold black', 1, ' - arch count check') if $opts{d};
 	foreach my $r ( keys %$archs ) {
 	    foreach my $p ( keys %{$archs->{$r}} ) {
@@ -267,6 +276,12 @@ foreach my $smever ( sort { $a <=> $b }
 		}
 	    }
 	}
+
+	printline('bold black', 1, ' - missing stage packages') if $opts{d};
+	movepkg($_, $stage, 0) foreach grep { $_->{latest} && $_->{latest} == 1 } @pkgs;
+
+	printline('bold black', 1, ' - obsolete packages') if $opts{d};
+	movepkg($_, 'delete') foreach grep { ! rprop($_, 'base') && ! $_->{done} && ( $_->{obsolete} || ( $_->{rpm}->is_source_package && ! $_->{inuse} ) ) } @pkgs;
     }
     printline('white', 0, "Finished processing.\n");
 
@@ -290,10 +305,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);
@@ -326,8 +342,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;
 }
@@ -367,15 +382,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';
@@ -403,7 +418,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} ) { 
@@ -449,29 +464,30 @@ sub printline {
 
 sub loadpkg {
     printline('white', 0, "Loading: $_") if -d _;
-    return unless m{/([^/]*)-[^-]+-[^-]+\.\w+.rpm} && ( ! $opts{r} || $1 =~ m{$opts{r}} );
+    return unless m{/([^/]*)-[^-]+-[^-]+\.\w+\.rpm$} && ( ! $opts{r} || $1 =~ m{$opts{r}} );
 
     my $pkg;
     eval { $pkg = RPM2->open_package($_, $rpm_flags); };
     if ($@) { printline('bold yellow on_red', 1, "Corrupt package $_"); return; }
     eval { my $sig = $pkg->siggpg };
     my $nosig = ! $@;
-    if ( $nosig && ! -f "$HOME/.rpmpass" ) {
-	printline('bold yellow on_red', 1, ' - ', $pkg->filename, ' (missing signature)');
-	return;
-    }
     
-    my ($srcname, $version, $release) = ($pkg->is_source_package ? basename $pkg->filename : $pkg->sourcerpm) =~ m{^([^/]*)-([^-]+)-([^-]+)\.\w+.rpm};
+    my ($srcname, $version, $release) = ($pkg->is_source_package ? basename $pkg->filename : $pkg->sourcerpm) =~ m{^([^/]*)-([^-]+)-([^-]+)\.\w+\.rpm$};
     foreach my $repo ( keys %{$skippkg->{$rel}} ) { return if (dirname $pkg->filename) =~ m{/$repo/} && grep { $_ eq $srcname } @{$skippkg->{$rel}->{$repo}}; }
     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" || ! $repos->{$reponame}->{orig} ) ) {
+	printline('bold yellow on_red', 1, ' - ', $pkg->filename, ' (missing signature)');
+	return;
+    }
     push @rpms, { base    => $srcname,
 		  name    => $pkg->name,
 		  repo    => $reponame,
@@ -483,12 +499,14 @@ sub loadpkg {
 		  nosig   => $nosig,
 		};
     $sources{$srcname}++;
-    $latest{$pkg->name} = $rpms[$#rpms] if ! $pkg->is_source_package && ( ! $latest{$pkg->name} || $pkg gt $latest{$pkg->name}->{rpm} );
+    if ( ! $pkg->is_source_package && ! $repos->{$reponame}->{stage} ) {
+	$latest{$pkg->name} = $rpms[$#rpms] if ! $latest{$pkg->name} || $pkg gt $latest{$pkg->name}->{rpm};
+    }
 }
 
 sub loadbase {
     printline('white', 0, "Loading: $_") if -d _;
-    return unless m{/([^/]*)-[^-]+-[^-]+\.\w+.rpm} && ($latest{$1} || $sources{$1});
+    return unless m{/([^/]*)-[^-]+-[^-]+\.\w+\.rpm$} && ($latest{$1} || $sources{$1});
 
     my $pkg;
     eval { $pkg = RPM2->open_package($_, $rpm_flags); };
@@ -497,14 +515,14 @@ sub loadbase {
     unless ($@) { printline('bold yellow on_red', 1, ' - ', $pkg->filename, ' (missing signature)'); return; }
 
     my $cmp = $latest{$pkg->name};
-    my ($srcname, $version, $release) = ($pkg->is_source_package ? basename $pkg->filename : $pkg->sourcerpm) =~ m{^([^/]*)-([^-]+)-([^-]+)\.\w+.rpm};
+    my ($srcname, $version, $release) = ($pkg->is_source_package ? basename $pkg->filename : $pkg->sourcerpm) =~ m{^([^/]*)-([^-]+)-([^-]+)\.\w+\.rpm$};
     my $pkgrepo = 'base';
     foreach my $repo ( keys %{$skippkg->{$rel}} ) { 
 	if ( (dirname $pkg->filename) =~ m{/$repo/} ) {
 	    return if grep { $_ eq $srcname } @{$skippkg->{$rel}->{$repo}}; 
 	    $pkgrepo = $repo;
 	    return unless $pkg->is_source_package || $cmp;
-	    return if ! $pkg->is_source_package && $pkg gt $cmp->{rpm} && rprop($cmp, 'base') && rprop($cmp, 'prio') > $repos->{$pkgrepo}->{prio};
+	    return if ! $pkg->is_source_package && $pkg ge $cmp->{rpm} && rprop($cmp, 'base') && rprop($cmp, 'prio') > $repos->{$pkgrepo}->{prio};
 	    last;
 	}
     }