--- builds_bin/update_repos	2007/11/03 19:06:19	1.20
+++ builds_bin/update_repos	2007/11/05 03:01:24	1.21
@@ -21,22 +21,23 @@ $| = 1;
 
 my @archs = ( 'i386', 'x86_64' );
 
-my $repos = { 'smeos'              => { prio => 16, inc => 1, ver => 1, rel => 1, os => 1 },
-	      'smeupdates'         => { prio => 15, inc => 1, ver => 1, rel => 1 },
-	      'smeupdates-testing' => { prio => 14, inc => 1, ver => 1, rel => 1 },
-	      'smeextras'          => { prio => 13, inc => 0, ver => 1, rel => 1 },
-	      'smeaddons'          => { prio => 12, inc => 0, ver => 1, rel => 1 },
-	      'smecontribs'        => { prio => 11, inc => 0, ver => 1, rel => 1 },
-	      'smetest'            => { prio => 10, inc => 1, ver => 2, rel => 2, devel => 2 },
-	      'smedev'             => { prio =>  9, inc => 0, ver => 2, rel => 2, devel => 1 },
-	      'centos'             => { prio =>  8, inc => 0, ver => 0, rel => 0, base => 1 },
-	      'fedora/epel'        => { prio =>  7, inc => 0, ver => 0, rel => 0, base => 1 },
-	      'fedora/extras'      => { prio =>  6, inc => 0, ver => 0, rel => 0, base => 1 },
-	      'rpmforge'           => { prio =>  5, inc => 0, ver => 0, rel => 0, base => 1 },
-	      'atrpms'             => { prio =>  4, inc => 0, ver => 0, rel => 0, base => 1 },
-	      'fedora/core'        => { prio =>  3, inc => 0, ver => 0, rel => 0, base => 1 },
-	      'base'               => { prio =>  2, inc => 0, ver => 0, rel => 0, base => 1 },
-	      'builds'             => { prio =>  1, inc => 0, ver => 0, rel => 0, builds => 1 },
+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 },
+	      'stage'              => { prio =>  1, inc => 0, ver => 0, rel => 0, stage => 1, os => 1 },
 	    };
 
 my $distrepo = { '7' => { active => 1,
@@ -44,14 +45,16 @@ my $distrepo = { '7' => { active => 1,
 			  fedora => 3,
 			  repo   => '/releases/7/',
 			  os     => 'SME/RPMS/',
-			  builds => '/builds2/smeserver-7-core/',
+			  builds => '/builds/smeserver-7-core/',
+			  stage  => '/stage/7/',
 			},
 		 '8' => { active => 1,
 			  centos => 5,
 			  fedora => 6,
 			  repo   => '/releases/testing/8/',
 			  os     => 'SME/',
-			  builds => '/builds2/smeserver-8-core/',
+			  builds => '/builds/smeserver-8-core/',
+			  stage  => '/stage/8/',
 			},
 	       };
 
@@ -85,17 +88,18 @@ $opts{r} ||= '';
 
 my ($devel1, $devel2) = sort { $repos->{$a}->{devel} <=> $repos->{$b}->{devel} } grep { $repos->{$_}->{devel} } keys %$repos;
 $devel2 ||= $devel1;
+my ($stage) = sort { $repos->{$a}->{stage} <=> $repos->{$b}->{stage} } grep { $repos->{$_}->{stage} } keys %$repos;
 
-my ($rel, @rpms, %pkgnames, %sources, $archs, $rebuild, $newline);
+my ($rel, @rpms, %latest, %sources, $archs, $rebuild, $newline);
 foreach my $smever ( sort { $a <=> $b } grep { $distrepo->{$_}->{active} } keys %$distrepo ) {
     $rel = $smever;
-    %pkgnames = ();
+    %latest = ();
     %sources = ();
     @rpms = ();
     $rebuild = ();
 
     # Load distro packages
-    find( { wanted => \&loadpkg, no_chdir => 1, follow_fast => 1 }, $distrepo->{$smever}->{repo}, $distrepo->{$smever}->{builds} );
+    find( { wanted => \&loadpkg, no_chdir => 1, follow_fast => 1 },  map { $distrepo->{$smever}->{$_} } ('repo','builds','stage') );
     printline('white', 0, "Distro (SME Server $rel) packages loaded.\n");
 
     # Load base packages
@@ -115,6 +119,7 @@ foreach my $smever ( sort { $a <=> $b }
     }
     printline('white', 0, 'Base (Centos: ', $distrepo->{$smever}->{centos}, ', Fedora: ', $distrepo->{$smever}->{fedora}, ") packages loaded.\n");
 
+    %latest = ();
     foreach my $name ( sort keys %{{ map { $_->{base} => 1 } @rpms }} ) {
 	printline('white', 0, "Processing: $name");
 	my @pkgs = sort pkgsrt grep { $_->{base} eq $name } @rpms;
@@ -123,7 +128,7 @@ 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}};
+	    next if $pkg->{done} || $pkg->{obsolete} || $pkg->{rpm}->is_source_package || ! $repos->{$pkg->{repo}} || rprop($pkg, 'stage');
 	    printline('bold black', 1, ' - ', $pkg->{rpm}->filename) if $opts{d};
 	    my $orig = 0;
 
@@ -135,8 +140,9 @@ foreach my $smever ( sort { $a <=> $b }
 		printline('dark blue', 1, '    - checking base/builds') if $opts{d};
 		my $repo = $names{$pkg->{name}} && $names{$pkg->{name}} > 1 ? $devel2 : $devel1;
 		if ( $pkg->{nonbase} ) {
-		    foreach my $up ( grep { $_->{name} eq $pkg->{name} && $_->{rpm} lt $pkg->{rpm} && $_->{obsolete} } @rpms ) {
+		    foreach my $up ( @pkgs ) {
 			next if rprop($up, 'builds') || rprop($up, 'base');
+			next if $up->{name} ne $pkg->{name} || ! $up->{obsolete} || $up->{rpm} ge $pkg->{rpm};
 			$repo = $up->{repo};
 			last;
 		    }
@@ -167,8 +173,16 @@ foreach my $smever ( sort { $a <=> $b }
 		if ( $cmp->{rpm}->is_source_package ) {
 		    if ( $cmp->{name} eq $pkg->{base} ) {
 			if ( $cmp->{rpm} eq $pkg->{rpm} ) {
-			    $pkg->{srpm} = $cmp if ! $pkg->{srpm} || $pkg->{srpm}->{rpm} ne $pkg->{rpm} || $pkg->{srpm}->{repo} ne $pkg->{repo};
-			    tagpkg($cmp, 'inuse', 0) if $pkg->{repo} eq $cmp->{repo} || rprop($cmp, 'base') || rprop($cmp, 'builds');
+			    if ( $pkg->{repo} eq $cmp->{repo} || ! $pkg->{srpm} || $pkg->{srpm}->{rpm} ne $pkg->{rpm} ) {
+				delete $pkg->{srpm}->{latest} if $pkg->{latest} && $pkg->{srpm} && $pkg->{srpm}->{latest};
+				$pkg->{srpm} = $cmp;
+				$pkg->{srpm}->{latest}++ if $pkg->{latest};
+			    }
+			    if ( $pkg->{latest} && rprop($cmp, 'stage') ) {
+				tagpkg($cmp, 'inuse');
+				$pkg->{srpm}->{latest}++;
+			    }
+			    tagpkg($cmp, 'inuse') if $pkg->{repo} eq $cmp->{repo} || rprop($cmp, 'base') || rprop($cmp, 'builds');
 			}
 			next if $pkg->{srpm} && $pkg->{srpm}->{rpm} eq $pkg->{rpm};
 
@@ -188,8 +202,16 @@ foreach my $smever ( sort { $a <=> $b }
 			    $src = '';
 			}
 			if ( $src eq $source && ( ! $pkg->{srpm} || $pkg->{srpm}->{rpm} eq $cmp->{rpm} ) ) {
-			    $pkg->{srpm} = $cmp if ! $pkg->{srpm} || ( $pkg->{srpm}->{rpm} eq $pkg->{rpm} && $pkg->{srpm}->{repo} ne $pkg->{repo} );
-			    tagpkg($cmp, 'inuse', 0) if $pkg->{repo} eq $cmp->{repo} || rprop($cmp, 'base') || rprop($cmp, 'builds');
+			    if ( ! $pkg->{srpm} || $pkg->{repo} eq $cmp->{repo} ) {
+				delete $pkg->{srpm}->{latest} if $pkg->{latest} && $pkg->{srpm} && $pkg->{srpm}->{latest};
+				$pkg->{srpm} = $cmp;
+				$pkg->{srpm}->{latest}++ if $pkg->{latest};
+			    }
+			    if ( $pkg->{latest} && rprop($cmp, 'stage') ) {
+				tagpkg($cmp, 'inuse');
+				$pkg->{srpm}->{latest}++;
+			    }
+			    tagpkg($cmp, 'inuse') if $pkg->{repo} eq $cmp->{repo} || rprop($cmp, 'base') || rprop($cmp, 'builds');
 			}
 		    }
 		} elsif ( $cmp->{rpm} eq $pkg->{rpm} ) {
@@ -197,6 +219,9 @@ foreach my $smever ( sort { $a <=> $b }
 			if ( $pkg->{repo} eq $cmp->{repo} ) {
 			    tagpkg($cmp, 'correct', 1);
 			    $seen{$cmp->{nvra}}++;
+			} elsif ( $seen{$cmp->{nvra}} && rprop($cmp, 'stage') && $pkg->{latest} ) {
+			    $_->{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');
 			    movepkg($cmp, 'delete', 1);
@@ -205,10 +230,10 @@ foreach my $smever ( sort { $a <=> $b }
 			    $seen{$cmp->{nvra}}++;
 			}
 		    } else {
-			tagpkg($cmp, 'nonbase', 0);
+			tagpkg($cmp, 'nonbase');
 		    }
 		} elsif ( rprop($cmp, 'prio') < rprop($pkg, 'prio') ) {
-		    tagpkg($cmp, 'obsolete', 0);
+		    tagpkg($cmp, 'obsolete');
 		}
 	    }
 	    printline('dark blue', 1, '    - checking source packages') if $opts{d};
@@ -223,6 +248,9 @@ 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;
 
@@ -252,7 +280,7 @@ foreach my $smever ( sort { $a <=> $b }
 	    qx(cat $HOME/.rpmpass | setsid rpm --addsign $src >& /dev/null) if $pkg->{nosig};
 	    if ( $pkg->{repos} ) {
 		foreach my $dest ( dest($pkg, @{$pkg->{repos}}) ) {
-		    qx(cp --preserve=timestamps $src $dest) unless -f $dest;
+		    qx(cp --preserve=timestamps $src $dest) unless -f "$dest";
 		}
 		$repochg{$_}++ foreach @{$pkg->{repos}};
 	    }
@@ -285,7 +313,7 @@ foreach my $smever ( sort { $a <=> $b }
 }
 
 sub pkgsrt {
-    return $b->{rpm} cmp $a->{rpm} || rprop($b, 'prio') <=> rprop($a, 'prio') || $a->{arch} cmp $b->{arch} || $a->{name} cmp $b->{name};
+    return $a->{rpm}->is_source_package <=> $b->{rpm}->is_source_package || $b->{rpm} cmp $a->{rpm} || rprop($b, 'prio') <=> rprop($a, 'prio');
 }
 
 sub rprop {
@@ -308,28 +336,25 @@ sub dest {
     my ($pkg, @repos) = @_;
     my @d = ();
     foreach my $repo ( @repos ) {
+	my $base = $distrepo->{$rel}->{repo};
+	$base = $distrepo->{$rel}->{stage} if $repos->{$repo}->{stage};
 	if ( $pkg->{arch} eq 'noarch' ) {
-	    push @d, $distrepo->{$rel}->{repo} . 
-		     "$repo/i386/" . 
+	    push @d, "$base$repo/i386/" . 
 		     ( $repos->{$repo}->{os} ? $distrepo->{$rel}->{os} : 'RPMS/' ) . 
 		     basename $pkg->{rpm}->filename;
-	    push @d, $distrepo->{$rel}->{repo} . 
-		     "$repo/x86_64/" . 
+	    push @d, "$base$repo/x86_64/" . 
 		     ( $repos->{$repo}->{os} ? $distrepo->{$rel}->{os} : 'RPMS/' ) . 
 		     basename $pkg->{rpm}->filename;
 	} elsif ( $pkg->{arch} =~ m{^(i[356]86)$} ) {
-	    push @d, $distrepo->{$rel}->{repo} . 
-		     "$repo/i386/" . 
+	    push @d, "$base$repo/i386/" . 
 		     ( $repos->{$repo}->{os} ? $distrepo->{$rel}->{os} : 'RPMS/' ) . 
 		     basename $pkg->{rpm}->filename;
 	} elsif ( $pkg->{arch} eq 'x86_64' ) {
-	    push @d, $distrepo->{$rel}->{repo} . 
-		     "$repo/x86_64/" . 
+	    push @d, "$base$repo/x86_64/" . 
 		     ( $repos->{$repo}->{os} ? $distrepo->{$rel}->{os} : 'RPMS/' ) . 
 		     basename $pkg->{rpm}->filename;
 	} elsif ( $pkg->{arch} eq 'zsrc' ) {
-	    push @d, $distrepo->{$rel}->{repo} . 
-		     "$repo/SRPMS/" . 
+	    push @d, "$base$repo/SRPMS/" . 
 		     basename $pkg->{rpm}->filename;
 	} else {
 	    printline('bold yellow on_red', 1, ' - ', $pkg->{rpm}->filename, ' (bad arch: ', $pkg->{arch}, ')');
@@ -364,6 +389,7 @@ sub movepkg {
 
 sub tagpkg {
     my ($pkg, $tag, $done) = @_;
+    defined $done or $done = 0;
 
     printline('bold magenta', 1, "       - ($tag) ", $pkg->{rpm}->filename) if $opts{d};
     delete $pkg->{obsolete} if $pkg->{obsolete};
@@ -378,6 +404,20 @@ sub done {
     delete $pkg->{obsolete} if $pkg->{obsolete};
 
     if ( $repos->{$pkg->{repo}} && ! rprop($pkg, 'base') && ! rprop($pkg, 'builds') ) {
+	# 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} ) { 
+		if ( rprop($pkg, 'inc') && ! $pkg->{rpm}->is_source_package ) {
+		    $latest{$pkg->{name}.'.'.$pkg->{arch}} = $pkg if ! $latest{$pkg->{name}.'.'.$pkg->{arch}};
+		    $pkg->{latest}++;
+		}
+	    }
+	} elsif ( ! $latest{$pkg->{name}} || $latest{$pkg->{name}}->{rpm} eq $pkg->{rpm} ) { 
+	    if ( rprop($pkg, 'inc') && ! $pkg->{rpm}->is_source_package ) {
+		$latest{$pkg->{name}} = $pkg if ! $latest{$pkg->{name}};
+		$pkg->{latest}++;
+	    }
+	}
 	unless ( $pkg->{oldrepo} ) {
 	    my $goodarch = 0;
 	    $goodarch++ if $pkg->{rpm}->filename =~ m{/(i386|x86_64)/.*\.noarch\.rpm$};
@@ -423,13 +463,19 @@ sub loadpkg {
     
     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 = dirname $pkg->filename) =~ s{^.*\d/(sme[^/]+)/.*$}{$1};
-    $reponame = 'builds' if ( dirname $pkg->filename) =~ m{/smeserver-\d+-core/};
+    my $reponame = 'unknown';
+    if ( substr($_, 0, length($distrepo->{$rel}->{builds})) eq $distrepo->{$rel}->{builds} ) {
+	$reponame = 'builds';
+    } elsif ( substr($_, 0, length($distrepo->{$rel}->{stage})) eq $distrepo->{$rel}->{stage} ) {
+	$reponame = 'stage';
+    } elsif ( (dirname $pkg->filename) =~ m{\d/(sme[^/]+)/} ) {
+	$reponame = $1;
+    }
 
     push @rpms, { base    => $srcname,
 		  name    => $pkg->name,
 		  repo    => $reponame,
-		  nvra    => $pkg->as_nvre . '.' . ( $pkg->is_source_package ? 'src' : $pkg->tag('ARCH') ),
+		  nvra    => $pkg->name.'-'.$pkg->version.'-'.$pkg->release.'.'.( $pkg->is_source_package ? 'src' : $pkg->tag('ARCH') ),
 		  arch    => $pkg->is_source_package ? 'zsrc' : $pkg->tag('ARCH'),
 		  version => $version,
 		  release => $release,
@@ -437,12 +483,12 @@ sub loadpkg {
 		  nosig   => $nosig,
 		};
     $sources{$srcname}++;
-    $pkgnames{$pkg->name} = $rpms[$#rpms] if ! $pkg->is_source_package && ( ! $pkgnames{$pkg->name} || $pkg gt $pkgnames{$pkg->name}->{rpm} );
+    $latest{$pkg->name} = $rpms[$#rpms] if ! $pkg->is_source_package && ( ! $latest{$pkg->name} || $pkg gt $latest{$pkg->name}->{rpm} );
 }
 
 sub loadbase {
     printline('white', 0, "Loading: $_") if -d _;
-    return unless m{/([^/]*)-[^-]+-[^-]+\.\w+.rpm} && ($pkgnames{$1} || $sources{$1});
+    return unless m{/([^/]*)-[^-]+-[^-]+\.\w+.rpm} && ($latest{$1} || $sources{$1});
 
     my $pkg;
     eval { $pkg = RPM2->open_package($_, $rpm_flags); };
@@ -450,7 +496,7 @@ sub loadbase {
     eval { my $sig = $pkg->siggpg };
     unless ($@) { printline('bold yellow on_red', 1, ' - ', $pkg->filename, ' (missing signature)'); return; }
 
-    my $cmp = $pkgnames{$pkg->name};
+    my $cmp = $latest{$pkg->name};
     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}} ) { 
@@ -466,7 +512,7 @@ sub loadbase {
     push @rpms, { base    => $srcname,
 		  name    => $pkg->name,
 		  repo    => $pkgrepo,
-		  nvra    => $pkg->as_nvre . '.' . ( $pkg->is_source_package ? 'src' : $pkg->tag('ARCH') ),
+		  nvra    => $pkg->name.'-'.$pkg->version.'-'.$pkg->release.'.'.( $pkg->is_source_package ? 'src' : $pkg->tag('ARCH') ),
 		  arch    => $pkg->is_source_package ? 'zsrc' : $pkg->tag('ARCH'),
 		  version => $version,
 		  release => $release,
@@ -474,7 +520,7 @@ sub loadbase {
 		  nosig   => 0,
 		};
     if ( ! $pkg->is_source_package && $pkg ge $cmp->{rpm} && ( $repos->{$pkgrepo}->{prio} >= rprop($cmp, 'prio') || ! rprop($cmp, 'base') ) ) {
-	$pkgnames{$pkg->name} = $rpms[$#rpms];
+	$latest{$pkg->name} = $rpms[$#rpms];
     }
 }