$basedir ||= "/var/lib/debbuild";
$dbbase ||= "build-db";
$transactlog ||= "transactions.log";
-#$mailprog ||= "/usr/sbin/sendmail";
-$mailprog = "/bin/true";
+$mailprog ||= "/usr/sbin/sendmail";
require "/etc/wanna-build.conf";
die "$conf::basedir is not a directory\n" if ! -d $conf::basedir;
die "dbbase is empty\n" if ! $dbbase;
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 );
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"
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;
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'});
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);
$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;
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"
$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++;
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 ".
$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".
}
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 {
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;
}
}
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
) );
}
}
sub table_name {
- return $arch . '_' . $distribution;
+ return '"' . $arch . '".packages';
}
sub user_table_name {
- return $arch . '_' . $distribution . '_users';
+ return '"' . $arch . '".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 = ?',
+ 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;
}
'depends = ?, ' .
'rel = ?, ' .
'bd_problem = ? ' .
- 'WHERE package = ?',
+ 'WHERE package = ? AND distribution = ?',
undef,
$pkg->{'version'},
$pkg->{'state'},
$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;
}
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;
}