X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=bin%2Fwanna-build;h=5d3f4b7d6577c0ee9bd08874279b5121389ebc8e;hb=d663a834bd6840d712f702dd14a9f65523d929f3;hp=8d56f007c73b20dc3d430767da5b24592ef8ded9;hpb=e45c22b6e1b7ef780c27dd98e281afdf0e0b671a;p=wannabuild.git

diff --git a/bin/wanna-build b/bin/wanna-build
index 8d56f00..5d3f4b7 100755
--- a/bin/wanna-build
+++ b/bin/wanna-build
@@ -455,10 +455,11 @@ BEGIN {
         '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, 'noversion' => 1 },
-        'set-dep-wait'  => { 'builder' => 1, },
-        'set-update'    => { 'noversion' => 1, }
-
+        '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'},
     };
 }
 
@@ -485,45 +486,88 @@ sub add_packages {
             }
         }
         if ($actions->{$op_mode} && $actions->{$op_mode}->{'builder'}) {
-            if ($pkg->{'builder'} && $user ne $pkg->{'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'})) {
-            if ( !pkg_version_eq($pkg,$version)) {
-                print "$pkg->{package}: version mismatch ($pkg->{'version'} by $pkg->{'builder'})\n";
+            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'}})) {
-                print "$name: skiping: state is $pkg->{'state'}, not in ".join(", ",@{$actions->{$op_mode}->{'from'}})."\n";
+            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-built") {
-            1;
-        }
-        elsif ($op_mode eq "set-attempted") {
-            1;
-        }
-        elsif ($op_mode eq "set-uploaded") {
-            add_one_uploaded( $name, $version, $pkg );
-        }
         elsif ($op_mode eq "set-failed") {
-            add_one_failed( $pkg );
+	    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") {
-            add_one_needsbuild( $pkg );
+	    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 );
@@ -538,7 +582,10 @@ sub add_packages {
             set_one_binnmu( $name, $version, $pkg );
         }
         elsif ($op_mode eq "set-update") {
-            set_one_update( $pkg );
+            $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'}) {
@@ -558,17 +605,14 @@ sub add_one_building {
 	$ok = 1;
 	my $pkg = shift;
 	if (defined($pkg)) {
-		if ($pkg->{'state'} eq "Not-For-Us") {
+            my $pkgnack = {
+                'Not-For-Us' => 'not suitable for this architecture',
+                'Dep-Wait' => 'not all source dependencies available yet',
+                'BD-Uninstallable' => 'source dependencies are not installable',
+            };
+		if ($pkgnack->{$pkg->{'state'}}) {
 			$ok = 0;
-			$reason = "not suitable for this architecture";
-		}
-		elsif ($pkg->{'state'} =~ /^Dep-Wait/) {
-			$ok = 0;
-			$reason = "not all source dependencies available yet";
-		}
-		elsif ($pkg->{'state'} =~ /^BD-Uninstallable/) {
-			$ok = 0;
-			$reason = "source dependencies are not installable";
+			$reason = $pkgnack->{$pkg->{'state'}};
 		}
 		elsif ($pkg->{'state'} eq "Uploaded" &&
 			   (version_lesseq($version, $pkg->{'version'}))) {
@@ -711,87 +755,6 @@ sub add_one_building {
 }
 
 
-sub add_one_uploaded {
-	my $name = shift;
-	my $version = shift;
-	my $pkg = shift;
-
-	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;
-	}
-	# 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 $pkg = shift;
-	my $state = $pkg->{'state'};
-        my $name = $pkg->{'package'};
-
-	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;
-	}
-
-	if (isin($state, qw<Needs-Build Uploaded Dep-Wait BD-Uninstallable>)) {
-		print "add_one_failed: $name: Warning: not registered for building previously (but $state), 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;
-	log_ta( $pkg, "--failed" );
-	update_source_info($pkg);
-	print "$name: registered as failed\n" if $verbose;
-}
-
 sub add_one_notforus {
 	my $pkg = shift;
 	my $state = $pkg->{'state'};
@@ -841,71 +804,6 @@ sub add_one_notforus {
 	update_source_info($pkg);
 }
 
-sub add_one_needsbuild {
-	my $pkg = shift;
-	my $state = $pkg->{'state'};
-        my $name = $pkg->{'package'};
-
-	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 (!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;
@@ -928,11 +826,7 @@ sub set_one_binnmu {
 			$pkg->{'binary_nmu_changelog'} = $fail_reason;
 			$pkg->{'notes'} = 'out-of-date';
                         delete $pkg->{'buildpri'};
-			if (defined $distributions{$distribution}{noadw}) {
-				change_state( \$pkg, 'Installed' );
-			} else {
-				change_state( \$pkg, 'BD-Uninstallable' );
-			}
+			change_state( \$pkg, 'BD-Uninstallable' );
 		}
 		log_ta( $pkg, "--binNMU" );
 		update_source_info($pkg);
@@ -954,14 +848,7 @@ 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;
@@ -976,16 +863,8 @@ sub set_one_binnmu {
 sub set_one_buildpri {
 	my $key = shift;
 	my $pkg = shift;
-	my $state = $pkg->{'state'};
         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 ( $build_priority ) {
 		$pkg->{$key} = $build_priority;
 	} else {
@@ -1004,11 +883,6 @@ sub add_one_depwait {
 		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";
-	}
-
 	if (isin( $state, qw<Installed Not-For-Us>)) {
             print "add_one_depwait: $name: skiping in state $state\n";
             return;
@@ -1033,13 +907,6 @@ sub add_one_depwait {
 	print "$name: registered as waiting for dependencies\n" if $verbose || $simulate;
 }
 
-sub set_one_update {
-	my $pkg = shift;
-        $pkg->{'version'} =~ s/\+b[0-9]+$//;
-
-	log_ta( $pkg, "--update" );
-	update_source_info($pkg);
-}
 
 # for sorting priorities and sections
 BEGIN {
@@ -1563,6 +1430,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;
@@ -1575,9 +1443,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;
 }