X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=bin%2Fwanna-build;h=77f4ac3b16998a0af0b351e23e06723a2da4dffc;hb=66c96bf07264477180e04399924431992cda7988;hp=7d3678ac4663abf5f2c601ab9b722473ff3c34fd;hpb=a447022b77f6a40d9d1f4b8f5ad26f964753f041;p=wannabuild.git

diff --git a/bin/wanna-build b/bin/wanna-build
index 7d3678a..77f4ac3 100755
--- a/bin/wanna-build
+++ b/bin/wanna-build
@@ -70,7 +70,7 @@ our ($verbose, $mail_logs, $list_order, $list_state,
     $short_date, $list_min_age, $list_max_age, $dbbase, @curr_time,
     $build_priority, %new_vers, $binNMUver, %merge_srcvers, %merge_binsrc,
     $printformat, $ownprintformat, $privmode, $extra_depends, $extra_conflicts,
-    %distributions, %distribution_aliases
+    %distributions, %distribution_aliases, $actions
     );
 our $Pas = '/org/buildd.debian.org/etc/packages-arch-specific/Packages-arch-specific';
 our $simulate = 0;
@@ -212,7 +212,7 @@ if ($distribution eq 'any-unpriv') {
 
 my $schema_suffix = '';
 $recorduser //= (not -t and $user//"" =~ /^buildd_/);
-if ((isin( $op_mode, qw(list info)) && $distribution !~ /security/ && !$recorduser && !($privmode)) || $simulate) {
+if ((isin( $op_mode, qw(list info distribution-architectures distribution-aliases)) && $distribution !~ /security/ && !$recorduser && !($privmode)) || $simulate) {
 	$dbh = DBI->connect("DBI:Pg:service=wanna-build") || 
 		die "FATAL: Cannot open database: $DBI::errstr\n";
 	$schema_suffix = '_public';
@@ -449,60 +449,152 @@ sub process {
 	}
 }
 
-sub add_packages {
-	my $newstate = shift;
-	my( $package, $name, $version, $ok, $reason );
-	
-	foreach $package (@_) {
-		$package =~ s,^.*/,,; # strip path
-		$package =~ s/\.(dsc|diff\.gz|tar\.gz|deb)$//; # strip extension
-		$package =~ s/_[a-zA-Z\d-]+\.changes$//; # strip extension
-		if ($package =~ /^([\w\d.+-]+)_([\w\d:.+~-]+)/) {
-			($name,$version) = ($1,$2);
-		}
-		else {
-			warn "$package: can't extract package name and version ".
-				 "(bad format)\n";
-			next;
-		}
 
-		if ($op_mode eq "set-building") {
-			add_one_building( $name, $version );
-		}
-		elsif ($op_mode eq "set-built") {
-			add_one_built( $name, $version );
-		}
-		elsif ($op_mode eq "set-attempted") {
-			add_one_attempted( $name, $version );
-		}
-		elsif ($op_mode eq "set-uploaded") {
-			add_one_uploaded( $name, $version );
-		}
-		elsif ($op_mode eq "set-failed") {
-			add_one_failed( $name, $version );
-		}
-		elsif ($op_mode eq "set-not-for-us") {
-			add_one_notforus( $name, $version );
-		}
-		elsif ($op_mode eq "set-needs-build") {
-			add_one_needsbuild( $name, $version );
-		}
-		elsif ($op_mode eq "set-dep-wait") {
-			add_one_depwait( $name, $version );
-		}
-		elsif ($op_mode eq "set-build-priority") {
-			set_one_buildpri( $name, $version, 'buildpri' );
-		}
-		elsif ($op_mode eq "set-permanent-build-priority") {
-			set_one_buildpri( $name, $version, 'permbuildpri' );
-		}
-		elsif ($op_mode eq "set-binary-nmu") {
-			set_one_binnmu( $name, $version );
-		}
-		elsif ($op_mode eq "set-update") {
-			set_one_update( $name, $version );
-		}
+BEGIN {
+    $actions = {
+        'set-building'  => { 'noversion' => 1, 'nopkgdef' => 1, },
+        'set-built'     => { 'builder' => 1, to => 'Built', action => 'built', 'from' => [qw<Building Build-Attempted>]},
+        'set-attempted' => { 'builder' => 1, to => 'Build-Attempted', action => 'attempted', 'from' => [qw<Building Build-Attempted>]},
+        'set-uploaded'  => { 'builder' => 1, to => 'Uploaded', action => 'uploaded', 'from' => [qw<Building Built Build-Attempted>], binversion => 1, },
+        'set-failed'    => { 'builder' => 1, to => 'Failed', action => 'failed', from => [qw<Building Built Build-Attempted Dep-Wait Failed>], warnfrom => [qw<Needs-Build Uploaded Dep-Wait BD-Uninstallable>], },
+        'set-dep-wait'  => { 'builder' => 1, warnfrom => [qw<Needs-Build Failed BD-Uninstallable>], },
+        'set-update'    => { 'noversion' => 1, },
+        'set-needs-build' => { builder => 1, to => 'BD-Uninstallable', action => 'give-back'},
+    };
+}
+
+sub add_packages {
+    my $newstate = shift;
+    my( $package, $name, $version, $ok, $reason );
+
+    foreach $package (@_) {
+        $package =~ s,^.*/,,; # strip path
+        $package =~ s/\.(dsc|diff\.gz|tar\.gz|deb)$//; # strip extension
+        $package =~ s/_[a-zA-Z\d-]+\.changes$//; # strip extension
+        if ($package =~ /^([\w\d.+-]+)_([\w\d:.+~-]+)/) {
+            ($name,$version) = ($1,$2);
+        } else {
+	    warn "$package: can't extract package name and version (bad format)\n";
+	    next;
 	}
+
+	my $pkg = get_source_info($name);
+        if (!($actions->{$op_mode}) || !($actions->{$op_mode}->{'nopkgdef'})) {
+            if (!defined($pkg)) {
+                print "$name: not registered yet.\n";
+                next;
+            }
+        }
+        if ($actions->{$op_mode} && $actions->{$op_mode}->{'builder'}) {
+            if (($pkg->{'builder'} && $user ne $pkg->{'builder'}) &&
+		!($pkg->{'builder'} =~ /^(\w+)-\w+/ && $1 eq $user) &&
+		!$opt_override) {
+                print "$pkg->{'package'}: not taken by you, but by $pkg->{'builder'}. Skipping.\n";
+                next;
+            }
+        }
+        if (!($actions->{$op_mode}) || !($actions->{$op_mode}->{'noversion'})) {
+            my $nmuver = binNMU_version($pkg->{version}, $pkg->{'binary_nmu_version'});
+            if ((!pkg_version_eq($pkg,$version) || $actions->{$op_mode}->{'binversion'}) && !version_eq( $nmuver, $version )) {
+                print "$pkg->{package}: version mismatch ($nmuver";
+                print " by $pkg->{'builder'}" if $pkg->{'builder'};
+                print ")\n";
+                next;
+            }
+        }
+
+        if ($actions->{$op_mode} && $actions->{$op_mode}->{'from'}) {
+            if (!isin($pkg->{'state'}, @{$actions->{$op_mode}->{'from'}}, @{$actions->{$op_mode}->{'warnfrom'}})) {
+                print "$name: skiping: state is $pkg->{'state'}, not in ".join(", ",@{$actions->{$op_mode}->{'from'}}, @{$actions->{$op_mode}->{'warnfrom'}})."\n";
+                next;
+            }
+        }
+        if ($actions->{$op_mode} && $actions->{$op_mode}->{'warnfrom'}) {
+            if (isin($pkg->{'state'}, @{$actions->{$op_mode}->{'warnfrom'}})) {
+                print "$name: warning: state is $pkg->{'state'}, processing anyways.\n";
+            }
+        }
+
+        if ($op_mode eq "set-building") {
+            add_one_building( $name, $version, $pkg );
+        }
+        elsif ($op_mode eq "set-failed") {
+	    print "$pkg->{'package'}: already registered as failed; will append new message\n" if $pkg->{'state'} eq "Failed";
+	    $pkg->{'builder'} = $user;
+	    $pkg->{'failed'} .= "\n" if $pkg->{'failed'};
+	    $pkg->{'failed'} .= $fail_reason;
+        }
+        elsif ($op_mode eq "set-not-for-us") {
+            add_one_notforus( $pkg );
+        }
+        elsif ($op_mode eq "set-needs-build") {
+	    my $state = $pkg->{'state'};
+
+	    if ($state eq "BD-Uninstallable") {
+            	if ($opt_override) {
+            		print "$name: Forcing uninstallability mark to be removed. This is not permanent and might be reset with the next trigger run\n";
+
+            		change_state( \$pkg, 'Needs-Build' );
+            		delete $pkg->{'builder'};
+            		delete $pkg->{'depends'};
+            		log_ta( $pkg, "--give-back" );
+            		update_source_info($pkg);
+            		print "$name: given back\n" if $verbose;
+            		next;
+            	}
+            	else {
+            		print "$name: has uninstallable build-dependencies. Skipping\n  (use --override to clear dependency list and give back anyway)\n";
+            		next;
+            	}
+            }
+            elsif ($state eq "Dep-Wait") {
+            	if ($opt_override) {
+            		print "$name: Forcing source dependency list to be cleared\n";
+            	}
+            	else {
+            		print "$name: waiting for source dependencies. Skipping\n  (use --override to clear dependency list and give back anyway)\n";
+            		next;
+            	}
+            }
+            elsif (!isin( $state, qw(Building Built Build-Attempted))) {
+            	print "$name: not taken for building (state is $state).";
+            	if ($opt_override) {
+            		print "\n$name: Forcing give-back\n";
+            	}
+            	else {
+            		print " Skipping.\n";
+            		next;
+            	}
+            }
+            $pkg->{'builder'} = undef;
+            $pkg->{'depends'} = undef;
+        }
+        elsif ($op_mode eq "set-dep-wait") {
+            add_one_depwait( $pkg );
+        }
+        elsif ($op_mode eq "set-build-priority") {
+            set_one_buildpri( 'buildpri', $pkg );
+        }
+        elsif ($op_mode eq "set-permanent-build-priority") {
+            set_one_buildpri( 'permbuildpri', $pkg );
+        }
+        elsif ($op_mode eq "set-binary-nmu") {
+            set_one_binnmu( $name, $version, $pkg );
+        }
+        elsif ($op_mode eq "set-update") {
+            $pkg->{'version'} =~ s/\+b[0-9]+$//;
+
+	    log_ta( $pkg, "--update" );
+	    update_source_info($pkg);
+        }
+
+        if ($actions->{$op_mode} && $actions->{$op_mode}->{'action'} && $actions->{$op_mode}->{'to'}) {
+	    change_state( \$pkg, $actions->{$op_mode}->{'to'} );
+	    log_ta( $pkg, "--".$actions->{$op_mode}->{'action'} );
+	    update_source_info($pkg);
+	    print "$name: registered as ".$actions->{$op_mode}->{'action'}."\n" if $verbose;
+        }
+    }
 }
 
 sub add_one_building {
@@ -511,7 +603,7 @@ sub add_one_building {
 	my( $ok, $reason );
 
 	$ok = 1;
-	my $pkg = get_source_info($name);
+	my $pkg = shift;
 	if (defined($pkg)) {
 		if ($pkg->{'state'} eq "Not-For-Us") {
 			$ok = 0;
@@ -665,194 +757,11 @@ sub add_one_building {
 	}
 }
 
-sub add_one_attempted {
-	my $name = shift;
-	my $version = shift;
-	my $pkg = get_source_info($name);
-
-	if (!defined($pkg)) {
-		print "$name: not registered yet.\n";
-		return;
-	}
-
-	if (($pkg->{'state'} ne "Building") && ($pkg->{'state'} ne "Build-Attempted")) {
-		print "$name: not taken for building (state is $pkg->{'state'}). ",
-			  "Skipping.\n";
-		return;
-	}
-	if ($pkg->{'builder'} ne $user) {
-		print "$name: not taken by you, but by $pkg->{'builder'}. Skipping.\n";
-		return;
-	}
-	elsif ( !pkg_version_eq($pkg, $version) ) {
-		print "$name: version mismatch ".
-			  "$(pkg->{'version'} ".
-			  "by $pkg->{'builder'})\n";
-		return;
-	}
-
-	change_state( \$pkg, 'Build-Attempted' );
-	log_ta( $pkg, "--attempted" );
-	update_source_info($pkg);
-	print "$name: registered as uploaded\n" if $verbose;
-}
-
-sub add_one_built {
-	my $name = shift;
-	my $version = shift;
-	my $pkg = get_source_info($name);
-
-	if (!defined($pkg)) {
-		print "$name: not registered yet.\n";
-		return;
-	}
-
-        if (($pkg->{'state'} ne "Building") && ($pkg->{'state'} ne "Build-Attempted")) {
-		print "$name: not taken for building (state is $pkg->{'state'}). ",
-			  "Skipping.\n";
-		return;
-	}
-	if ($pkg->{'builder'} ne $user) {
-		print "$name: not taken by you, but by $pkg->{'builder'}. Skipping.\n";
-		return;
-	}
-	elsif ( !pkg_version_eq($pkg, $version) ) {
-		print "$name: version mismatch ".
-			  "$(pkg->{'version'} ".
-			  "by $pkg->{'builder'})\n";
-		return;
-	}
-	change_state( \$pkg, 'Built' );
-	log_ta( $pkg, "--built" );
-	update_source_info($pkg);
-	print "$name: registered as built\n" if $verbose;
-}
-
-sub add_one_uploaded {
-	my $name = shift;
-	my $version = shift;
-	my $pkg = get_source_info($name);
-
-	if (!defined($pkg)) {
-		print "$name: not registered yet.\n";
-		return;
-	}
-
-	if ($pkg->{'state'} eq "Uploaded" &&
-		pkg_version_eq($pkg,$version)) {
-		print "$name: already uploaded\n";
-		return;
-	}
-	if (!isin( $pkg->{'state'}, qw(Building Built Build-Attempted))) {
-		print "$name: not taken for building (state is $pkg->{'state'}). ",
-			  "Skipping.\n";
-		return;
-	}
-	if ($pkg->{'builder'} ne $user) {
-		print "$name: not taken by you, but by $pkg->{'builder'}. Skipping.\n";
-		return;
-	}
-	# strip epoch -- buildd-uploader used to go based on the filename.
-	# (to remove at some point)
-	my $pkgver;
-	($pkgver = $pkg->{'version'}) =~ s/^\d+://;
-	$version =~ s/^\d+://; # for command line use
-	if ($pkg->{'binary_nmu_version'} ) {
-		my $nmuver = binNMU_version($pkgver, $pkg->{'binary_nmu_version'});
-		if (!version_eq( $nmuver, $version )) {
-			print "$name: version mismatch ($nmuver registered). ",
-				  "Skipping.\n";
-			return;
-		}
-	} elsif (!version_eq($pkgver, $version)) {
-		print "$name: version mismatch ($pkg->{'version'} registered). ",
-			  "Skipping.\n";
-		return;
-	}
-
-	change_state( \$pkg, 'Uploaded' );
-	log_ta( $pkg, "--uploaded" );
-	update_source_info($pkg);
-	print "$name: registered as uploaded\n" if $verbose;
-}
-
-sub add_one_failed {
-	my $name = shift;
-	my $version = shift;
-	my $state;
-	my $pkg = get_source_info($name);
-
-	if (!defined($pkg)) {
-		print "$name: not registered yet.\n";
-		return;
-	}
-	$state = $pkg->{'state'};
-
-	if ($state eq "Not-For-Us") {
-		print "$name: not suitable for this architecture anyway. Skipping.\n";
-		return;
-	}
-	elsif ($state eq "Failed-Removed") {
-		print "$name: failed previously and doesn't need building. Skipping.\n";
-		return;
-	}
-	elsif ($state eq "Installed") {
-		print "$name: Is already installed in archive. Skipping.\n";
-		return;
-	}
-	elsif ($pkg->{'builder'} &&
-		   (($user ne $pkg->{'builder'}) &&
-		    !($pkg->{'builder'} =~ /^(\w+)-\w+/ && $1 eq $user))) {
-		print "$name: not taken by you, but by ".
-			  "$pkg->{'builder'}. Skipping.\n";
-		return;
-	}
-	elsif ( !pkg_version_eq($pkg, $version) ) {
-		print "$name: version mismatch ".
-			  "$(pkg->{'version'} ".
-			  "by $pkg->{'builder'})\n";
-		return;
-	}
-
-	if ($state eq "Needs-Build") {
-		print "$name: Warning: not registered for building previously, ".
-			  "but processing anyway.\n";
-	}
-	elsif ($state eq "Uploaded") {
-		print "$name: Warning: marked as uploaded previously, ".
-			  "but processing anyway.\n";
-	}
-	elsif ($state eq "Dep-Wait") {
-		print "$name: Warning: marked as waiting for dependencies, ".
-			  "but processing anyway.\n";
-	}
-	elsif ($state eq "BD-Uninstallable") {
-		print "$name: Warning: marked as having uninstallable build-dependencies, ".
-			  "but processing anyway.\n";
-	}
-	elsif ($state eq "Failed") {
-		print "$name: already registered as failed; will append new message\n"
-			if $fail_reason;
-	}
-
-	change_state( \$pkg, 'Failed' );
-	$pkg->{'builder'} = $user;
-	$pkg->{'failed'} .= "\n" if $pkg->{'failed'};
-	$pkg->{'failed'} .= $fail_reason;
-	if (defined $pkg->{'permbuildpri'}) {
-		$pkg->{'buildpri'} = $pkg->{'permbuildpri'};
-	} else {
-		delete $pkg->{'buildpri'};
-	}
-	log_ta( $pkg, "--failed" );
-	update_source_info($pkg);
-	print "$name: registered as failed\n" if $verbose;
-}
 
 sub add_one_notforus {
-	my $name = shift;
-	my $version = shift;
-	my $pkg = get_source_info($name);
+	my $pkg = shift;
+	my $state = $pkg->{'state'};
+        my $name = $pkg->{'package'};
 
 	if ($pkg->{'state'} eq 'Not-For-Us') {
 		# reset Not-For-Us state in case it's called twice; this is
@@ -881,7 +790,6 @@ sub add_one_notforus {
 		$pkg->{'package'} = $name;
 		delete $pkg->{'builder'};
 		delete $pkg->{'depends'};
-		delete $pkg->{'buildpri'};
 		delete $pkg->{'binary_nmu_version'};
 		delete $pkg->{'binary_nmu_changelog'};
 		log_ta( $pkg, "--no-build" );
@@ -899,101 +807,11 @@ sub add_one_notforus {
 	update_source_info($pkg);
 }
 
-sub add_one_needsbuild {
-	my $name = shift;
-	my $version = shift;
-	my $state;
-	my $pkg = get_source_info($name);
-
-	if (!defined($pkg)) {
-		print "$name: not registered; can't give back.\n";
-		return;
-	}
-	$state = $pkg->{'state'};
-
-	if ($state eq "BD-Uninstallable") {
-		if ($opt_override) {
-			print "$name: Forcing uninstallability mark to be removed. This is not permanent and might be reset with the next trigger run\n";
-
-			change_state( \$pkg, 'Needs-Build' );
-			delete $pkg->{'builder'};
-			delete $pkg->{'depends'};
-			log_ta( $pkg, "--give-back" );
-			update_source_info($pkg);
-			print "$name: given back\n" if $verbose;
-			return;
-		}
-		else {
-			print "$name: has uninstallable build-dependencies. Skipping\n",
-				  "  (use --override to clear dependency list and ",
-				  "give back anyway)\n";
-			return;
-		}
-	}
-	elsif ($state eq "Dep-Wait") {
-		if ($opt_override) {
-			print "$name: Forcing source dependency list to be cleared\n";
-		}
-		else {
-			print "$name: waiting for source dependencies. Skipping\n",
-				  "  (use --override to clear dependency list and ",
-				  "give back anyway)\n";
-			return;
-		}
-	}
-	elsif (!isin( $state, qw(Building Built Build-Attempted))) {
-		print "$name: not taken for building (state is $state).";
-		if ($opt_override) {
-			print "\n$name: Forcing give-back\n";
-		}
-		else {
-			print " Skipping.\n";
-			return;
-		}
-	}
-	if (defined ($pkg->{'builder'}) && $user ne $pkg->{'builder'} &&
-		!($pkg->{'builder'} =~ /^(\w+)-\w+/ && $1 eq $user) &&
-		!$opt_override) {
-		print "$name: not taken by you, but by ".
-			  "$pkg->{'builder'}. Skipping.\n";
-		return;
-	}
-	if (!pkg_version_eq($pkg, $version)) {
-		print "$name: version mismatch ($pkg->{'version'} registered). ",
-			  "Skipping.\n";
-		return;
-	}
-	if (!defined $distributions{$distribution}{noadw}) {
-		change_state( \$pkg, 'BD-Uninstallable' );
-		$pkg->{'bd_problem'} = "Installability of build dependencies not tested yet";
-	} else {
-		change_state( \$pkg, 'Needs-Build' );
-	}
-	$pkg->{'builder'} = undef;
-	$pkg->{'depends'} = undef;
-	log_ta( $pkg, "--give-back" );
-	update_source_info($pkg);
-	print "$name: given back\n" if $verbose;
-}
-
 sub set_one_binnmu {
 	my $name = shift;
 	my $version = shift;
-	my $pkg = get_source_info($name);
-	my $state;
-
-	if (!defined($pkg)) {
-		print "$name: not registered; can't register for binNMU.\n";
-		return;
-	}
-	my $db_ver = $pkg->{'version'};
-
-	if (!version_eq($db_ver, $version)) {
-		print "$name: version mismatch ($db_ver registered). ",
-			  "Skipping.\n";
-		return;
-	}
-	$state = $pkg->{'state'};
+	my $pkg = shift;
+	my $state = $pkg->{'state'};
 
 	if (defined $pkg->{'binary_nmu_version'}) {
 		if ($binNMUver == 0) {
@@ -1002,6 +820,7 @@ sub set_one_binnmu {
 			delete $pkg->{'depends'};
 			delete $pkg->{'binary_nmu_version'};
 			delete $pkg->{'binary_nmu_changelog'};
+                        delete $pkg->{'buildpri'};
 		} elsif ($binNMUver <= $pkg->{'binary_nmu_version'}) {
 			print "$name: already building binNMU $pkg->{'binary_nmu_version'}\n";
 			return;
@@ -1009,13 +828,8 @@ sub set_one_binnmu {
 			$pkg->{'binary_nmu_version'} = $binNMUver;
 			$pkg->{'binary_nmu_changelog'} = $fail_reason;
 			$pkg->{'notes'} = 'out-of-date';
-			$pkg->{'buildpri'} = $pkg->{'permbuildpri'}
-				if (defined $pkg->{'permbuildpri'});
-			if (defined $distributions{$distribution}{noadw}) {
-				change_state( \$pkg, 'Installed' );
-			} else {
-				change_state( \$pkg, 'BD-Uninstallable' );
-			}
+                        delete $pkg->{'buildpri'};
+			change_state( \$pkg, 'BD-Uninstallable' );
 		}
 		log_ta( $pkg, "--binNMU" );
 		update_source_info($pkg);
@@ -1037,123 +851,53 @@ sub set_one_binnmu {
 		return;
 	}
 
-	if (!defined $distributions{$distribution}{noadw}) {
-		change_state( \$pkg, 'BD-Uninstallable' );
-		$pkg->{'bd_problem'} = "Installability of build dependencies not tested yet";
-	}
-	else
-	{
-		change_state( \$pkg, 'Needs-Build' );
-	}
+	change_state( \$pkg, 'BD-Uninstallable' );
 	delete $pkg->{'builder'};
 	delete $pkg->{'depends'};
 	$pkg->{'binary_nmu_version'} = $binNMUver;
 	$pkg->{'binary_nmu_changelog'} = $fail_reason;
 	$pkg->{'notes'} = 'out-of-date';
+        delete $pkg->{'buildpri'};
 	log_ta( $pkg, "--binNMU" );
 	update_source_info($pkg);
 	print "${name}: registered for binNMU $fullver\n" if $verbose;
 }
 
 sub set_one_buildpri {
-	my $name = shift;
-	my $version = shift;
 	my $key = shift;
-	my $pkg = get_source_info($name);
-	my $state;
-
-	if (!defined($pkg)) {
-		print "$name: not registered; can't set priority.\n";
-		return;
-	}
-	$state = $pkg->{'state'};
+	my $pkg = shift;
+        my $name = $pkg->{'package'};
 
-	if ($state eq "Not-For-Us") {
-		print "$name: not suitable for this architecture. Skipping.\n";
-		return;
-	} elsif ($state eq "Failed-Removed") {
-		print "$name: failed previously and doesn't need building. Skipping.\n";
-		return;
-        }
-	if (!pkg_version_eq($pkg, $version)) {
-		print "$name: version mismatch ($pkg->{'version'} registered). ",
-			  "Skipping.\n";
-		return;
-	}
-	if ( $build_priority == 0 ) {
-		delete $pkg->{'buildpri'}
-			if $key eq 'permbuildpri' and defined $pkg->{'buildpri'}
-			and $pkg->{'buildpri'} == $pkg->{$key};
-		delete $pkg->{$key};
-	} else {
-		$pkg->{'buildpri'} = $build_priority
-			if $key eq 'permbuildpri';
+	if ( $build_priority ) {
 		$pkg->{$key} = $build_priority;
+	} else {
+		delete $pkg->{$key};
 	}
 	update_source_info($pkg);
 	print "$name: set to build priority $build_priority\n" if $verbose;
 }
 
 sub add_one_depwait {
-	my $name = shift;
-	my $version = shift;
-	my $state;
-	my $pkg = get_source_info($name);
-
-	if (!defined($pkg)) {
-		print "$name: not registered yet.\n";
-		return;
-	}
-	$state = $pkg->{'state'};
+	my $pkg = shift;
+	my $state = $pkg->{'state'};
+        my $name = $pkg->{'package'};
 
 	if ($state eq "Dep-Wait") {
 		print "$name: merging with previously registered dependencies\n";
 	}
 	
-	if (isin( $state, qw(Needs-Build Failed BD-Uninstallable))) {
-		print "$name: Warning: not registered for building previously, ".
-			  "but processing anyway.\n";
-	}
-	elsif ($state eq "Not-For-Us") {
-		print "$name: not suitable for this architecture anyway. Skipping.\n";
-		return;
-	}
-	elsif ($state eq "Failed-Removed") {
-		print "$name: failed previously and doesn't need building. Skipping.\n";
-		return;
-	}
-	elsif ($state eq "Installed") {
-		print "$name: Is already installed in archive. Skipping.\n";
-		return;
-	}
-	elsif ($state eq "Uploaded") {
-		print "$name: Is already uploaded. Skipping.\n";
-		return;
-	}
-	elsif ($pkg->{'builder'} &&
-		   $user ne $pkg->{'builder'}) {
-		print "$name: not taken by you, but by ".
-			  "$pkg->{'builder'}. Skipping.\n";
-		return;
-	}
-	elsif ( !pkg_version_eq($pkg,$version)) {
-		print "$name: version mismatch ".
-			  "($pkg->{'version'} ".
-			  "by $pkg->{'builder'})\n";
-		return;
-	}
-	elsif ($fail_reason =~ /^\s*$/ ||
+	if (isin( $state, qw<Installed Not-For-Us>)) {
+            print "add_one_depwait: $name: skiping in state $state\n";
+            return;
+        }
+        
+	if ($fail_reason =~ /^\s*$/ ||
 		   !parse_deplist( $fail_reason, 1 )) {
 		print "$name: Bad dependency list\n";
 		return;
 	}
 	change_state( \$pkg, 'Dep-Wait' );
 	$pkg->{'builder'} = $user;
-	if (defined $pkg->{'permbuildpri'}) {
-		$pkg->{'buildpri'} = $pkg->{'permbuildpri'};
-	} else {
-		delete $pkg->{'buildpri'};
-	}
 	my $deplist = parse_deplist( $pkg->{'depends'} );
 	my $new_deplist = parse_deplist( $fail_reason );
 	# add new dependencies, maybe overwriting old entries
@@ -1161,24 +905,9 @@ sub add_one_depwait {
 		$deplist->{$_} = $new_deplist->{$_};
 	}
 	$pkg->{'depends'} = build_deplist($deplist);
-	log_ta( $pkg, "--dep-wait" );
-	update_source_info($pkg);
-	print "$name: registered as waiting for dependencies\n" if $verbose;
-}
-
-sub set_one_update {
-	my $name = shift;
-	my $version = shift;
-	my $pkg = get_source_info($name);
-
-	if (!defined($pkg)) {
-		print "$name: not registered yet.\n";
-		return;
-	}
-        $pkg->{'version'} =~ s/\+b[0-9]+$//;
-
-	log_ta( $pkg, "--update" );
-	update_source_info($pkg);
+	log_ta( $pkg, "--dep-wait" ) unless $simulate;
+	update_source_info($pkg) unless $simulate;
+	print "$name: registered as waiting for dependencies\n" if $verbose || $simulate;
 }
 
 
@@ -1257,7 +986,7 @@ sub sort_list_func {
     my $map_funcs = {
         'C' => ['<->', sub { return $_[0]->{'calprio'}; }],
         'W' => ['<->', sub { return $_[0]->{'state_days'}; }],
-        'P' => ['<->', sub { return $_[0]->{'buildpri'}; }],
+        'P' => ['<->', sub { return ($_[0]->{'buildpri'}//0) + ($_[0]->{'permbuildpri'}//0); }],
         'p' => ['<=>', sub { return $prioval{$_[0]->{'priority'}//""}//0; }],
         's' => ['<=>', sub { return $sectval{$_[0]->{'section'}//""}//0; }],
         'n' => ['cmp', sub { return $_[0]->{'package'}; }],
@@ -1402,7 +1131,7 @@ Text could contain further %. To start with !, use %!
             no warnings;
             my $c = "$pkg->{'priority'}:$pkg->{'notes'}";
             $c .= ":PREV-FAILED" if $pkg->{'previous_state'} && $pkg->{'previous_state'} =~ /^Failed/;
-            $c .= ":bp{" . $pkg->{'buildpri'} . "}" if defined $pkg->{'buildpri'};
+            $c .= ":bp{" . (($pkg->{'buildpri'}//0)+($pkg->{'permbuildpri'}//0)) . "}" if (($pkg->{'buildpri'}//0)+($pkg->{'permbuildpri'}//0));
             $c .= ":binNMU{" . $pkg->{'binary_nmu_version'} . "}" if defined $pkg->{'binary_nmu_version'};
             $c .= ":calprio{". $pkg->{'calprio'}."}";
             $c .= ":days{". $pkg->{'state_days'}."}";
@@ -1436,15 +1165,15 @@ Text could contain further %. To start with !, use %!
 
 sub list_packages {
 	my $state = shift;
-	my( $name, $pkg, @list );
+	my @list;
 	my $cnt = 0;
 	my %scnt;
 	my $ctime = time;
 
- 	my $db = get_all_source_info(state => $state, user => $user, list_min_age => $list_min_age);
-	foreach $name (keys %$db) {
-		next if $name =~ /^_/;
-		push @list, calculate_prio($db->{$name});
+ 	my $db = get_all_source_info(state => $state, user => $user, list_min_age => $list_min_age, multisuite => 1);
+	foreach my $key (keys %$db) {
+		next if $key =~ /^_/;
+		push @list, calculate_prio($db->{$key});
 	}
 
         # filter components
@@ -1458,7 +1187,7 @@ sub list_packages {
         $printformat ||= $yamlmap->{"format"}{"default"}{"default"};
         undef $printformat if ($ownprintformat && $ownprintformat eq 'none');
 
-	foreach $pkg (sort sort_list_func @list) {
+	foreach my $pkg (sort sort_list_func @list) {
                 no warnings;
                 if ($printformat) {
                     print print_format($printformat, $pkg, {'cnt' => $cnt, 'scnt' => \%scnt})."\n";
@@ -1704,6 +1433,7 @@ sub change_state {
 	my $newstate = shift;
 	my $state = \$pkg->{'state'};
 	
+        $newstate = 'Needs-Build' if $newstate eq 'BD-Uninstallable' && $distributions{$distribution}{noadw};
 	return if defined($$state) and $$state eq $newstate;
         $pkg->{'previous_state'} = $$state if defined($$state);
 	$pkg->{'state_change'} = $curr_date;
@@ -1716,9 +1446,8 @@ sub change_state {
 			($pkg->{'old_failed'} // "");
 		delete $pkg->{'failed'};
 	}
-	if (defined($$state) and $$state eq 'BD-Uninstallable') {
-		delete $pkg->{'bd_problem'};
-	}
+	delete $pkg->{'bd_problem'} if ($$state//"") eq 'BD-Uninstallable';
+        $pkg->{'bd_problem'} = "Installability of build dependencies not tested yet" if $newstate eq 'BD-Uninstallable';
 	$$state = $newstate;
 }
 
@@ -1785,6 +1514,7 @@ sub parse_deplist {
     my $verify = shift;
     my %result;
     
+    return $verify ? 0 : \%result unless $deps;
     foreach (split( /\s*,\s*/, $deps )) {
         if ($verify) {
             # verification requires > starting prompts, no | crap
@@ -2206,7 +1936,20 @@ sub get_all_source_info {
 		push @args, -$options{list_min_age} . " days";
 	}
 
-	my $db = $dbh->selectall_hashref($q, 'package', undef, @args);
+	my $db;
+        if (($options{multisuite}) && (!$distribution || $distribution =~ / /)) {
+            # return packages in multiple suites - only for those functions marked as clean for that api change
+            $db = $dbh->selectall_hashref($q, [qw<package distribution>], undef, @args);
+            my $dbk = {};
+            foreach my $p ( keys %$db ) {
+                foreach my $d (keys %{$db->{$p}}) {
+                    $dbk->{"$p/$d"} = $db->{$p}->{$d};
+                }
+            }
+            $db = $dbk;
+        } else {
+            $db = $dbh->selectall_hashref($q, [qw<package>], undef, @args);
+        }
 	return $db;
 }
 
@@ -2360,12 +2103,13 @@ sub parse_all_v3 {
     foreach my $name (keys %$srcs) {
         next if $name eq '_binary';
 
-        # state = installed, out-of-date, uncompiled, not-for-us, auto-not-for-us
+        # state = installed, out-of-date, uncompiled, packages-arch-specific, overwritten-by-arch-all, arch-not-in-arch-list, arch-all-only
         my $pkgs = $srcs->{$name};
+        next if isin($pkgs->{'status'}, qw <arch-all-only>);
         my $pkg = $db->{$name};
 
         unless ($pkg) {
-            next SRCS if $pkgs->{'status'} eq 'not-for-us';
+            next SRCS if $pkgs->{'status'} eq 'packages-arch-specific';
             my $logstr = sprintf("merge-v3 %s %s_%s (%s, %s):", $vars->{'time'}, $name, $pkgs->{'version'}, $vars->{'arch'}, $vars->{'suite'});
 
             # does at least one binary exist in the database and is more recent - if so, we're probably just outdated, ignore the source package
@@ -2377,18 +2121,22 @@ sub parse_all_v3 {
             }
             $pkg->{'package'}  = $name;
         }
+        $pkg->{'version'} ||= "";
+        $pkg->{'state'} ||= "";
         my $logstr = sprintf("merge-v3 %s %s_%s", $vars->{'time'}, $name, $pkgs->{'version'}).
             ($pkgs->{'binnmu'} ? ";b".$pkgs->{'binnmu'} : "").
             sprintf(" (%s, %s, previous: %s", $vars->{'arch'}, $vars->{'suite'}, $pkg->{'version'}//"").
             ($pkg->{'binary_nmu_version'} ? ";b".$pkg->{'binary_nmu_version'} : "").
-            ", $pkg->{'state'}):";
+            ", $pkg->{'state'}".($pkg->{'notes'} ? "/".$pkg->{'notes'} : "")."):";
 
         if (isin($pkgs->{'status'}, qw (installed related)) && $pkgs->{'version'} eq $pkg->{'version'} && ($pkgs->{'binnmu'}//0) < int($pkg->{'binary_nmu_version'}//0)) {
                 $pkgs->{'status'} = 'out-of-date';
         }
-        if (isin($pkgs->{'status'}, qw (installed related auto-not-for-us))) {
+        if (isin($pkgs->{'status'}, qw <installed related arch-not-in-arch-list packages-arch-specific overwritten-by-arch-all arch-all-only>)) {
             my $change = 0;
-            my $tstate = {'installed' => 'Installed', 'related' => 'Installed', 'auto-not-for-us' => 'Auto-Not-For-Us'}->{$pkgs->{'status'}};
+            my $tstate = {'installed' => 'Installed', 'related' => 'Installed', 
+                'arch-not-in-arch-list' => 'Auto-Not-For-Us', 'packages-arch-specific' => 'Auto-Not-For-Us', 'overwritten-by-arch-all' => 'Auto-Not-For-Us', 'arch-all-only' => 'Auto-Not-For-Us',
+                }->{$pkgs->{'status'}};
             next if isin( $pkg->{'state'}, qw<Not-For-Us Failed Failed-Removed Dep-Wait Dep-Wait-Removed>) && isin( $tstate, qw<Auto-Not-For-Us>);
             # if the package is currently current, the status is Installed, not not-for-us
             if ($pkg->{'state'} ne $tstate) {
@@ -2408,9 +2156,12 @@ sub parse_all_v3 {
                     $change++;
                 }
             }
-            if (isin($pkgs->{'status'}, qw (related)) and $pkg->{'notes'} ne "related") {
-                $pkg->{'notes'} = "related";
-                $change++;
+            if (isin($pkgs->{'status'}, qw <related packages-arch-specific overwritten-by-arch-all arch-not-in-arch-list arch-all-only>)) {
+                my $tnotes = $pkgs->{'status'};
+                if (($pkg->{'notes'}//"") ne $tnotes) {
+                    $pkg->{'notes'} = $tnotes;
+                    $change++;
+                }
             }
             if ($change) {
                 print "$logstr set to $tstate/".($pkg->{'notes'}//"")."\n" if $verbose || $simulate;
@@ -2420,21 +2171,6 @@ sub parse_all_v3 {
             next;
         }
 
-        if ($pkgs->{'status'} eq 'not-for-us') {
-            next if isin( $pkg->{'state'}, qw(Not-For-Us Installed Failed-Removed));
-
-            if (isin( $pkg->{'state'}, qw(Failed Build-Attempted Built))) {
-                change_state( \$pkg, "Failed-Removed" );
-		log_ta( $pkg, "--merge-v3: Failed-Removed" ) unless $simulate;
-		update_source_info($pkg) unless $simulate;
-                print "$logstr (virtually) deleted from database\n" if $verbose || $simulate;
-                next;
-            }
-
-            print "$logstr should delete (not-for-us according to P-a-s)\n" if $verbose || $simulate || 1; # not implemented yet on purpose
-            next;
-        }
-
         # only uncompiled / out-of-date are left, so check if anything new
         if (!(isin($pkgs->{'status'}, qw (uncompiled out-of-date)))) {
             print "$logstr package in unknown state: $pkgs->{'status'}\n";
@@ -2466,6 +2202,7 @@ sub parse_all_v3 {
         delete $pkg->{'builder'};
         delete $pkg->{'binary_nmu_version'} unless $pkgs->{'binnmu'};
         delete $pkg->{'binary_nmu_changelog'} unless $pkgs->{'binnmu'};
+        delete $pkg->{'buildpri'};
         log_ta( $pkg, "--merge-v3: needs-build" ) unless $simulate;
         update_source_info($pkg) unless $simulate;
         print "$logstr set to needs-builds\n" if $simulate || $verbose;