From: Andreas Barth <aba@not.so.argh.org>
Date: Fri, 29 Apr 2011 11:57:54 +0000 (+0000)
Subject: cleanup $arch in call_edos_depcheck
X-Git-Url: https://git.donarmstrong.com/?p=wannabuild.git;a=commitdiff_plain;h=33f375d471ae7ba49c41eaa6771c79f75d6ad33e

cleanup $arch in call_edos_depcheck
cleanup main loop
move --recorduser to the ssh-wrapper
---

diff --git a/bin/ssh-wrapper b/bin/ssh-wrapper
index 813ba32..14d9525 100755
--- a/bin/ssh-wrapper
+++ b/bin/ssh-wrapper
@@ -18,5 +18,5 @@ shift
 
 [ -f "$bin" -a -x "$bin" ] || exit 1
 
-exec $bin $@
+exec $bin --recorduser $@
 
diff --git a/bin/wanna-build b/bin/wanna-build
index b2d75b5..1fb5b90 100755
--- a/bin/wanna-build
+++ b/bin/wanna-build
@@ -3,7 +3,7 @@
 # wanna-build: coordination script for Debian buildds
 # Copyright (C) 1998 Roman Hodek <Roman.Hodek@informatik.uni-erlangen.de>
 # Copyright (C) 2005-2008 Ryan Murray <rmurray@debian.org>
-# Copyright (C) 2010      Andreas Barth <aba@not.so.argh.org>
+# Copyright (C) 2010,2011 Andreas Barth <aba@not.so.argh.org>
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License as
@@ -222,7 +222,6 @@ END {
 $distribution ||= "sid";
 
 my $schema_suffix = '';
-$recorduser //= (not -t and $user//"" =~ /^buildd_/);
 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";
@@ -344,22 +343,12 @@ $list_order ||= $yamlmap->{"list-order"}{'default'};
 $api //= $yamlmap->{"api"};
 $api //= 0;
 
-process();
-
-$dbh->commit;
-$dbh->disconnect;
-
-if ($mail_logs && $conf::log_mail) {
-	send_mail( $conf::log_mail,
-			   "wanna-build $distribution state changes $curr_date",
-			   "State changes at $curr_date for distribution ".
-			   "$distribution:\n\n$mail_logs\n" );
+if (isin($op_mode, qw<forget-user merge-v3 import>) && defined @conf::admin_users && !isin( $real_user, @conf::admin_users) && !$simulate ) {
+    die "This operation is restricted to admin users";
+}
+if (!isin($op_mode, qw<distribution-architectures distribution-aliases>)) {
+    die "need an architecture" unless $arch;
 }
-
-exit 0;
-
-
-sub process {
 
 	SWITCH: foreach ($op_mode) {
 		/^set-(.+)/ && do {
@@ -375,9 +364,6 @@ sub process {
 			last SWITCH;
 		};
 		/^forget-user/ && do {
-			die "This operation is restricted to admin users\n"
-				if (defined @conf::admin_users and
-				    !isin( $real_user, @conf::admin_users));
 			forget_users( @ARGV );
 			last SWITCH;
 		};
@@ -386,8 +372,6 @@ sub process {
 			last SWITCH;
 		};
 		/^merge-v3/ && do {
-                        die "This operation is restricted to admin users\n"
-			    if (defined @conf::admin_users and !isin( $real_user, @conf::admin_users) and !$simulate);
                         # call with installed-packages+ . installed-sources+ [ . available-for-build-packages* [ . consider-as-installed-source* ]  ]
                         # in case available-for-build-packages is not specified, installed-packages are used
                         lock_table() unless $simulate;
@@ -414,12 +398,7 @@ sub process {
                         last SWITCH;
 		};
 		/^import/ && do {
-			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() . 
-				" WHERE distribution = ?", undef,
-				$distribution)
+			$dbh->do("DELETE from ".table_name()." WHERE distribution = ?", undef, $distribution)
 				or die $dbh->errstr;
 			forget_users();
 			read_db( $import_from );
@@ -451,8 +430,20 @@ sub process {
 			update_user_info($user);
 		}
 	}
+
+
+$dbh->commit unless $simulate;
+$dbh->disconnect;
+
+if ($mail_logs && $conf::log_mail) {
+	send_mail( $conf::log_mail,
+			   "wanna-build $distribution state changes $curr_date",
+			   "State changes at $curr_date for distribution ".
+			   "$distribution:\n\n$mail_logs\n" );
 }
 
+exit 0;
+
 
 BEGIN {
     $actions = {
@@ -1693,12 +1684,12 @@ sub call_edos_depcheck {
         # If such a "binary" package is installable, the corresponding source package is buildable.
 	print $SOURCES "Package: source---$key\n";
 	print $SOURCES "Version: $pkg->{'version'}\n";
-        my $t = &filterarch($srcs->{$key}{'dep'} || $srcs->{$key}{'depends'}, $arch);
-        my $tt = &filterarch($pkg->{'extra_depends'}, $arch);
+        my $t = &filterarch($srcs->{$key}{'dep'} || $srcs->{$key}{'depends'}, $args->{'arch'});
+        my $tt = &filterarch($pkg->{'extra_depends'}, $args->{'arch'});
         $t = $t ? ($tt ? "$t, $tt" : $t) : $tt;
 	print $SOURCES "Depends: $t\n" if $t;
-        my $u = &filterarch($srcs->{$key}{'conf'} || $srcs->{$key}{'conflicts'}, $arch);
-        my $uu = &filterarch($pkg->{'extra_conflicts'}, $arch);
+        my $u = &filterarch($srcs->{$key}{'conf'} || $srcs->{$key}{'conflicts'}, $args->{'arch'});
+        my $uu = &filterarch($pkg->{'extra_conflicts'}, $args->{'arch'});
         $u = $u ? ($uu ? "$u, $uu" : $u) : $uu;
 	print $SOURCES "Conflicts: $u\n" if $u;
 	print $SOURCES "Architecture: all\n";