X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=bin%2Fwanna-build;h=4ba644ebbdb4149adb1e30f1c8a496a79d389ab5;hb=80adc1ea160f423e6cfbb348bf1efefbac89d332;hp=3035153a165626ffe8099fe54797fa280c19d161;hpb=acfa3acf338fe2abe52a7f35d91a2bc25bd96696;p=wannabuild.git

diff --git a/bin/wanna-build b/bin/wanna-build
index 3035153..4ba644e 100755
--- a/bin/wanna-build
+++ b/bin/wanna-build
@@ -24,9 +24,8 @@ package conf;
 $basedir ||= "/var/lib/debbuild";
 $dbbase ||= "build-db";
 $transactlog ||= "transactions.log";
-#$mailprog ||= "/usr/sbin/sendmail";
-$mailprog = "/bin/true";
-require "/etc/wanna-build.conf";
+$mailprog ||= "/usr/sbin/sendmail";
+require "/org/wanna-build/etc/wanna-build.conf";
 die "$conf::basedir is not a directory\n" if ! -d $conf::basedir;
 die "dbbase is empty\n" if ! $dbbase;
 die "transactlog is empty\n" if ! $transactlog;
@@ -40,6 +39,7 @@ use POSIX;
 use FileHandle;
 use File::Copy;
 use DBI;
+use lib '/org/wanna-build/bin';
 use WannaBuild;
 
 our ($verbose, $mail_logs, $list_order, $list_state,
@@ -302,8 +302,17 @@ END {
 	}
 }
 
-$dbh = DBI->connect("DBI:Pg:database=wanna-build") || 
-	die "FATAL: Cannot open database: $DBI::errstr\n";
+my $schema_suffix = '';
+if (isin( $op_mode, qw(list info)) && $distribution !~ /security/) {
+	$dbh = DBI->connect("DBI:Pg:service=wanna-build") || 
+		die "FATAL: Cannot open database: $DBI::errstr\n";
+	$schema_suffix = '_public';
+}
+else
+{
+	$dbh = DBI->connect("DBI:Pg:service=wanna-build-privileged") || 
+		die "FATAL: Cannot open database: $DBI::errstr\n";
+}
 
 # TODO: This shouldn't be needed, file a bug.
 $dbh->{pg_server_prepare} = 0;
@@ -401,7 +410,9 @@ sub process {
 			die "This operation is restricted to admin users\n"
 				if (defined @conf::admin_users and
 				    !isin( $real_user, @conf::admin_users));
-			$dbh->do("DELETE from " . table_name())
+			$dbh->do("DELETE from " . table_name() . 
+				" WHERE distribution = ?", undef,
+				$distribution)
 				or die $dbh->errstr;
 			forget_users();
 			read_db( $import_from );
@@ -598,7 +609,7 @@ sub add_one_building {
 		my $ok = 'ok';
 		if ($pkg->{'binary_nmu_version'}) {
 			print "$name: Warning: needs binary NMU $pkg->{'binary_nmu_version'}\n" .
-			      "$pkg->{'Binary-NMU-Changelog'}\n";
+			      "$pkg->{'binary_nmu_changelog'}\n";
 			$ok = 'aok';
 		} else {
 			print "$name: Warning: Previous version failed!\n"
@@ -857,7 +868,7 @@ sub add_one_notforus {
 		delete $pkg->{'depends'};
 		delete $pkg->{'buildpri'};
 		delete $pkg->{'binary_nmu_version'};
-		delete $pkg->{'Binary-NMU-Changelog'};
+		delete $pkg->{'binary_nmu_changelog'};
 		log_ta( $pkg, "--no-build" );
 		print "$name: registered as unsuitable\n" if $verbose;
 
@@ -926,7 +937,8 @@ sub add_one_needsbuild {
 		}
 	}
 	if (defined ($pkg->{'builder'}) && $user ne $pkg->{'builder'} &&
-		    !($pkg->{'builder'} =~ /^(\w+)-\w+/ && $1 eq $user)) {
+		!($pkg->{'builder'} =~ /^(\w+)-\w+/ && $1 eq $user) &&
+		!$opt_override) {
 		print "$name: not taken by you, but by ".
 			  "$pkg->{'builder'}. Skipping.\n";
 		return;
@@ -974,13 +986,13 @@ sub set_one_binnmu {
 			delete $pkg->{'builder'};
 			delete $pkg->{'depends'};
 			delete $pkg->{'binary_nmu_version'};
-			delete $pkg->{'Binary-NMU-Changelog'};
+			delete $pkg->{'binary_nmu_changelog'};
 		} elsif ($binNMUver <= $pkg->{'binary_nmu_version'}) {
 			print "$name: already building binNMU $pkg->{'binary_nmu_version'}\n";
 			return;
 		} else {
 			$pkg->{'binary_nmu_version'} = $binNMUver;
-			$pkg->{'Binary-NMU-Changelog'} = $fail_reason;
+			$pkg->{'binary_nmu_changelog'} = $fail_reason;
 			$pkg->{'notes'} = 'out-of-date';
 			$pkg->{'buildpri'} = $pkg->{'permbuildpri'}
 				if (defined $pkg->{'permbuildpri'});
@@ -1010,7 +1022,7 @@ sub set_one_binnmu {
 	delete $pkg->{'builder'};
 	delete $pkg->{'depends'};
 	$pkg->{'binary_nmu_version'} = $binNMUver;
-	$pkg->{'Binary-NMU-Changelog'} = $fail_reason;
+	$pkg->{'binary_nmu_changelog'} = $fail_reason;
 	$pkg->{'notes'} = 'out-of-date';
 	log_ta( $pkg, "--binNMU" );
 	update_source_info($pkg);
@@ -1328,7 +1340,7 @@ sub parse_packages {
 		$pkg->{'version'} = $version
 			if version_less( $pkg->{'version'}, $version);
 		delete $pkg->{'binary_nmu_version'};
-		delete $pkg->{'Binary-NMU-Changelog'};
+		delete $pkg->{'binary_nmu_changelog'};
 		log_ta( $pkg, "--merge-packages" );
 		update_source_info($pkg);
 		print "$name ($version) is up-to-date now.\n" if $verbose;
@@ -1454,7 +1466,7 @@ sub parse_quinn_diff {
 			change_state( \$pkg, 'Dep-Wait' );
 			$pkg->{'version'}  = $version;
 			delete $pkg->{'binary_nmu_version'};
-			delete $pkg->{'Binary-NMU-Changelog'};
+			delete $pkg->{'binary_nmu_changelog'};
 			log_ta( $pkg, "--merge-quinn" );
 			$change++;
 			print "$name ($version) still waiting for dependencies.\n"
@@ -1519,7 +1531,7 @@ sub parse_quinn_diff {
 			$pkg->{'notes'}    = $notes;
 			delete $pkg->{'builder'};
 			delete $pkg->{'binary_nmu_version'};
-			delete $pkg->{'Binary-NMU-Changelog'};
+			delete $pkg->{'binary_nmu_changelog'};
 			log_ta( $pkg, "--merge-quinn" );
 			$new_vers{$name}++;
 			$change++;
@@ -1553,7 +1565,8 @@ sub parse_quinn_diff {
 
 	if ($dubious) {
 		send_mail( $conf::db_maint,
-				   "Dubious versions in " . table_name() . " table",
+				   "Dubious versions in " . table_name() . " "
+				   . $distribution . " table",
 				   "The following packages have a newer version in the ".
 				   "wanna-build database\n".
 				   "than what quinn-diff says, and this is strange for ".
@@ -1756,9 +1769,9 @@ sub list_packages {
 		next if $category && $pkg->{'state'} eq "Failed" &&
 				$pkg->{'failed_category'} ne $category;
 		next if ($list_min_age > 0 &&
-				 ($ctime-parse_date($pkg->{'State-Change'})) < $list_min_age)||
+				 ($ctime-parse_date($pkg->{'state_change'})) < $list_min_age)||
 				($list_min_age < 0 &&
-				 ($ctime-parse_date($pkg->{'State-Change'})) > -$list_min_age);
+				 ($ctime-parse_date($pkg->{'state_change'})) > -$list_min_age);
 		push( @list, $pkg );
 	}
 
@@ -1788,7 +1801,7 @@ sub list_packages {
 		          join("\n    ",split("\n",$pkg->{'bd_problem'})), "\n"
 			if $pkg->{'state'} eq "BD-Uninstallable";
 		print "  Previous state was $pkg->{'previous_state'} until ",
-			  "$pkg->{'State-Change'}\n"
+			  "$pkg->{'state_change'}\n"
 			if $verbose && $pkg->{'previous_state'};
 		print "  No previous state recorded\n"
 			if $verbose && !$pkg->{'previous_state'};
@@ -1831,15 +1844,39 @@ sub info_packages {
 				chomp( $val );
 				$val = "\n$val" if isin( $key, qw(Failed Old-Failed));
 				$val =~ s/\n/\n    /g;
-				printf "  %-20s: %s\n", $key, $val;
+				my $print_key = $key;
+				$print_key = 'Package' if ($key eq 'package');
+				$print_key = 'Version' if ($key eq 'version');
+				$print_key = 'Builder' if ($key eq 'builder');
+				$print_key = 'State' if ($key eq 'state');
+				$print_key = 'Section' if ($key eq 'section');
+				$print_key = 'Priority' if ($key eq 'priority');
+				$print_key = 'Installed-Version' if ($key eq 'installed_version');
+				$print_key = 'Previous-State' if ($key eq 'previous_state');
+				$print_key = 'State-Change' if ($key eq 'state_change');
+				printf "  %-20s: %s\n", $print_key, $val;
 			}
 			foreach $key (sort keys %$pkg) {
 				next if isin( $key, @firstkeys );
 				my $val = $pkg->{$key};
+				next if !defined($val);
 				chomp( $val );
 				$val = "\n$val" if isin( $key, qw(Failed Old-Failed));
 				$val =~ s/\n/\n    /g;
-				printf "  %-20s: %s\n", $key, $val;
+				my $print_key = $key;
+				$print_key = 'BD-Problem' if ($key eq 'bd_problem');
+				$print_key = 'Binary-NMU-Changelog' if ($key eq 'binary_nmu_changelog');
+				$print_key = 'Binary-NMU-Version' if ($key eq 'binary_nmu_version');
+				$print_key = 'BuildPri' if ($key eq 'buildpri');
+				$print_key = 'Depends' if ($key eq 'depends');
+				$print_key = 'Failed' if ($key eq 'failed');
+				$print_key = 'Failed-Category' if ($key eq 'failed_category');
+				$print_key = 'Notes' if ($key eq 'notes');
+				$print_key = 'Distribution' if ($key eq 'distribution');
+				$print_key = 'Old-Failed' if ($key eq 'old_failed');
+				$print_key = 'PermBuildPri' if ($key eq 'permbuildpri');
+				$print_key = 'Rel' if ($key eq 'rel');
+				printf "  %-20s: %s\n", $print_key, $val;
 			}
 		}
 	}
@@ -1864,7 +1901,7 @@ sub forget_packages {
 			$data .= sprintf "  %-20s: %s\n", $key, $val;
 		}
 		send_mail( $conf::db_maint,
-				   "$name deleted from DB " . table_name(),
+				   "$name deleted from DB " . table_name() . " " . $distribution,
 				   "The package '$name' has been deleted from the database ".
 				   "by $user.\n\n".
 				   "Data registered about the deleted package:\n".
@@ -1877,7 +1914,8 @@ sub forget_packages {
 }
 
 sub forget_users {
-	$dbh->do("DELETE from " . user_table_name()) or die $dbh->errstr;
+	$dbh->do("DELETE from " . user_table_name() . 
+		" WHERE distribution = ?", undef, $distribution) or die $dbh->errstr;
 }
 
 sub read_db {
@@ -1909,8 +1947,10 @@ sub read_db {
 		elsif(exists($thispkg{'user'})) {
 			# user in import, username in database.
 			$dbh->do('INSERT INTO ' . user_table_name() .
-					' (username, last_seen) values (?, ?)',
-				undef, $thispkg{'user'}, $thispkg{'last_seen'})
+					' (username, distribution, last_seen)' .
+					' values (?, ?, ?)',
+				undef, $thispkg{'user'}, $distribution,
+				$thispkg{'last_seen'})
 				or die $dbh->errstr;
 		 }
 	}
@@ -1933,18 +1973,18 @@ sub check_entry {
 			  join( "\n", map { "$_: $pkg->{$_}" } keys %$pkg ), "\n";
 		die "Database entry lacks package or username field\n";
 	}
-	if (!exists $pkg->{'version'}) {
-		die "Database entry for $pkg->{'package'} lacks Version: field\n";
-	}
 	# if no State: field, generate one (for old db compat)
 	if (!exists($pkg->{'state'})) {
 		$pkg->{'state'} =
 			exists $pkg->{'failed'} ? 'Failed' : 'Building';
 	}
+	if (!exists $pkg->{'version'} and $pkg->{'state'} ne 'Not-For-Us') {
+		die "Database entry for $pkg->{'package'} lacks Version: field\n";
+	}
 	# check state field
 	die "Bad state $pkg->{'state'} of package $pkg->{Package}\n"
 		if !isin( $pkg->{'state'},
-				  qw(Needs-Build Building Built Build-Attempted Uploaded Installed Dep-Wait
+				  qw(Needs-Build Building Built Build-Attempted Uploaded Installed Dep-Wait Dep-Wait-Removed
 					 Failed Failed-Removed Not-For-Us BD-Uninstallable
 					 ) );
 }
@@ -1957,7 +1997,7 @@ sub change_state {
 	
 	return if defined($$state) and $$state eq $newstate;
         $pkg->{'previous_state'} = $$state if defined($$state);
-	$pkg->{'State-Change'} = $curr_date;
+	$pkg->{'state_change'} = $curr_date;
 
 	if (defined($$state) and $$state eq 'Failed') {
 		$pkg->{'old_failed'} =
@@ -2309,6 +2349,7 @@ sub usage {
 Usage: $prgname <options...> <package_version...>
 Options:
     -v, --verbose: Verbose execution.
+    -A arch: Architecture this operation is for.
     --take: Take package for building [default operation]
     -f, --failed: Record in database that a build failed due to
         deficiencies in the package (that aren't fixable without a new
@@ -2369,24 +2410,26 @@ sub pkg_version_eq {
 }
 
 sub table_name {
-	return $arch . '_' . $distribution;
+	return '"' . $arch . $schema_suffix . '".packages';
 }
 
 sub user_table_name {
-	return $arch . '_' . $distribution . '_users';
+	return '"' . $arch . $schema_suffix . '".users';
 }
 
 sub get_source_info {
 	my $name = shift;
 	my $pkg = $dbh->selectrow_hashref('SELECT * FROM ' . 
-		table_name() . ' WHERE package = ?',
-		undef, $name);
+		table_name() . ' WHERE package = ? AND distribution = ?' .
+		'FOR UPDATE',
+		undef, $name, $distribution);
 	return $pkg;
 }
 
 sub get_all_source_info {
-	my $db = $dbh->selectall_hashref('SELECT * FROM ' . table_name(),
-		'package');
+	my $db = $dbh->selectall_hashref('SELECT * FROM ' . table_name() .
+		' WHERE distribution = ?',
+		'package', undef, $distribution);
 	return $db;
 }
 
@@ -2419,7 +2462,7 @@ sub update_source_info {
 			'depends = ?, ' .
 			'rel = ?, ' .
 			'bd_problem = ? ' .
-			'WHERE package = ?',
+			'WHERE package = ? AND distribution = ?',
 		undef,
 		$pkg->{'version'},
 		$pkg->{'state'},
@@ -2440,36 +2483,38 @@ sub update_source_info {
 		$pkg->{'depends'},
 		$pkg->{'rel'},
 		$pkg->{'bd_problem'},
-		$pkg->{'package'}) or die $dbh->errstr;
+		$pkg->{'package'},
+		$distribution) or die $dbh->errstr;
 }
 
 sub add_source_info {
 	my $pkg = shift;
 	$dbh->do('INSERT INTO ' . table_name() .
-			' (package) values (?)',
-		undef, $pkg->{'package'}) or die $dbh->errstr;
+			' (package, distribution) values (?, ?)',
+		undef, $pkg->{'package'}, $distribution) or die $dbh->errstr;
 }
 
 sub del_source_info {
 	my $name = shift;
 	$dbh->do('DELETE FROM ' . table_name() .
-			' WHERE package = ?',
-		undef, $name) or die $dbh->errstr;
+			' WHERE package = ? AND distribution = ?',
+		undef, $name, $distribution) or die $dbh->errstr;
 }
 
 sub get_user_info {
 	my $name = shift;
 	my $user = $dbh->selectrow_hashref('SELECT * FROM ' . 
-		user_table_name() . ' WHERE username = ?',
-		undef, $name);
+		user_table_name() . ' WHERE username = ? AND distribution = ?',
+		undef, $name, $distribution);
 	return $user;
 }
 
 sub update_user_info {
 	my $user = shift;
 	$dbh->do('UPDATE ' . user_table_name() .
-			' SET last_seen = now() WHERE username = ?',
-		undef, $user)
+			' SET last_seen = now() WHERE username = ?' .
+			' AND distribution = ?',
+		undef, $user, $distribution)
 		or die $dbh->errstr;
 }
 
@@ -2477,8 +2522,9 @@ sub update_user_info {
 sub add_user_info {
 	my $user = shift;
 	$dbh->do('INSERT INTO ' . user_table_name() .
-			' (username, last_seen) values (?, now())',
-		undef, $user)
+			' (username, distribution, last_seen)' .
+			' values (?, ?, now())',
+		undef, $user, $distribution)
 		or die $dbh->errstr;
 }