--- builds_bin/update_repos	2007/11/08 19:25:07	1.28
+++ builds_bin/update_repos	2007/11/23 16:45:36	1.29
@@ -27,7 +27,7 @@ my $repos = { 'smeos'              => {
 	      '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 => 1, ver => 2, rel => 2, devel => 2 },
+	      '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 },
@@ -149,7 +149,7 @@ foreach my $smever ( sort { $a <=> $b }
 	    # Move packages from base/builds to correct area
 	    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;
+		my $repo = $names{$pkg->{name}} > 1 ? $devel2 : $devel1;
 		$repo = $contribs if $pkg->{repo} eq 'contribs';
 		if ( $pkg->{nonbase} ) {
 		    foreach my $up ( @pkgs ) {
@@ -159,7 +159,6 @@ foreach my $smever ( sort { $a <=> $b }
 			last;
 		    }
 		} 
-		next if rprop($pkg, 'base') && $repo eq $devel1;
 		movepkg($pkg, $repo);
 		%names = names($pkg, @pkgs);
 		$seen{$pkg->{nvra}}++;
@@ -240,8 +239,10 @@ foreach my $smever ( sort { $a <=> $b }
 			    $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');
@@ -463,7 +464,7 @@ 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); };
@@ -471,7 +472,7 @@ sub loadpkg {
     eval { my $sig = $pkg->siggpg };
     my $nosig = ! $@;
     
-    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} ) {
@@ -505,7 +506,7 @@ sub loadpkg {
 
 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); };
@@ -514,7 +515,7 @@ 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/} ) {