cleanup main loop
move --recorduser to the ssh-wrapper
[ -f "$bin" -a -x "$bin" ] || exit 1
[ -f "$bin" -a -x "$bin" ] || exit 1
+exec $bin --recorduser $@
# 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>
# 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
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License as
$distribution ||= "sid";
my $schema_suffix = '';
$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";
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";
$api //= $yamlmap->{"api"};
$api //= 0;
$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 {
SWITCH: foreach ($op_mode) {
/^set-(.+)/ && do {
last SWITCH;
};
/^forget-user/ && do {
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;
};
forget_users( @ARGV );
last SWITCH;
};
last SWITCH;
};
/^merge-v3/ && do {
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;
# 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;
last SWITCH;
};
/^import/ && do {
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 );
or die $dbh->errstr;
forget_users();
read_db( $import_from );
update_user_info($user);
}
}
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" );
# 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";
# 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;
$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";
$u = $u ? ($uu ? "$u, $uu" : $u) : $uu;
print $SOURCES "Conflicts: $u\n" if $u;
print $SOURCES "Architecture: all\n";