our ($verbose, $mail_logs, $list_order, $list_state,
$curr_date, $op_mode, $user, $real_user, $distribution,
- $fail_reason, $opt_override, $import_from, $export_to, $opt_create_db,
+ $fail_reason, $opt_override, $import_from, $export_to,
%prioval, %sectval,
$info_all_dists, $arch,
- $category, %catval, %short_category,
$short_date, $list_min_age, $list_max_age, $dbbase, @curr_time,
$build_priority, %new_vers, $binNMUver, %merge_srcvers, %merge_binsrc,
$printformat, $ownprintformat, $privmode, $extra_depends, $extra_conflicts,
$short_date = strftime("%m/%d/%y",@curr_time);
$| = 1;
-%short_category = ( u => "uploaded-fixed-pkg",
- f => "fix-expected",
- r => "reminder-sent",
- n => "nmu-offered",
- e => "easy",
- m => "medium",
- h => "hard",
- c => "compiler-error",
- "" => "none" );
-
# set mode of operation based on command line switch. Should be used
# by GetOptions below.
sub _set_mode_set { $op_mode = "set-$_[0]" }
},
'verbose|v' => \$verbose,
'override|o' => \$opt_override,
- 'create-db' => \$opt_create_db,
'correct-compare' => \$WannaBuild::opt_correct_version_cmp,
# TODO: remove after buildds no longer pass to wanna-build
reupload-wait bd-uninstallable ) ];
},
'dist|d=s' => sub {
+ $distribution = $_[1];
given ( $_[1] ) {
when ( [qw< a all >] ) {
$info_all_dists = 1;
},
'arch|A=s' => \$arch,
'user|U=s' => \$user,
- 'category|c=s' => sub {
- $category = $_[1];
- $category = $short_category{$category}
- if exists $short_category{$category};
- die "Unknown category: $category\n"
- if not $category ~~ [ values %short_category ];
- },
'min-age|a=i' => \$list_min_age,
'max-age=i' => \$list_max_age,
'format=s' => \$printformat,
'extra-conflicts=s' => \$extra_conflicts,
# special actions
- 'export' => sub { _set_mode(@_); $export_to = $_[1]; },
- 'import' => sub { _set_mode(@_); $import_from = $_[1]; },
+ 'export=s' => sub { _set_mode(@_); $export_to = $_[1]; },
+ 'import=s' => sub { _set_mode(@_); $import_from = $_[1]; },
'manual-edit' => \&_set_mode,
'distribution-architectures' => \&_set_mode,
'distribution-aliases' => \&_set_mode,
}
$distribution = $distribution_aliases{$distribution} if (isin($distribution, keys %distribution_aliases));
-$op_mode = $category ? "set-failed" : "set-building"
- if !$op_mode; # default operation
+$op_mode ||= "set-building";
undef $distribution if $distribution eq 'any';
if ($distribution) {
my @dists = split(/[, ]+/, $distribution);
!($user = $real_user);
if (!$fail_reason) {
- if ($op_mode eq "set-failed" && !$category) {
+ if ($op_mode eq "set-failed" ) {
print "Enter reason for failing (end with '.' alone on ".
"its line):\n";
my $line;
sub add_one_failed {
my $name = shift;
my $version = shift;
- my ($state, $cat);
+ my $state;
my $pkg = get_source_info($name);
if (!defined($pkg)) {
return;
}
- $cat = $category;
- if (!$cat && $fail_reason =~ /^\[([^\]]+)\]/) {
- $cat = $1;
- $cat = $short_category{$cat} if exists $short_category{$cat};
- if (!isin( $cat, values %short_category )) {
- print "$name: Warning: unknown category $cat; discarded\n";
- $cat = "";
- }
- $fail_reason =~ s/^\[[^\]]+\][ \t]*\n*//;
- }
-
if ($state eq "Needs-Build") {
print "$name: Warning: not registered for building previously, ".
"but processing anyway.\n";
elsif ($state eq "Failed") {
print "$name: already registered as failed; will append new message\n"
if $fail_reason;
- print "$name: already registered as failed; changing category\n"
- if $cat;
- }
-
- if (($cat eq "reminder-sent" || $cat eq "nmu-offered") &&
- defined $pkg->{'failed_category'} &&
- $pkg->{'failed_category'} ne $cat) {
- (my $action = $cat) =~ s/-/ /;
- $fail_reason .= "\n$short_date: $action";
}
change_state( \$pkg, 'Failed' );
$pkg->{'builder'} = $user;
$pkg->{'failed'} .= "\n" if $pkg->{'failed'};
$pkg->{'failed'} .= $fail_reason;
- $pkg->{'failed_category'} = $cat if $cat;
- if (defined $pkg->{'permbuildpri'}) {
- $pkg->{'buildpri'} = $pkg->{'permbuildpri'};
- } else {
- delete $pkg->{'buildpri'};
- }
log_ta( $pkg, "--failed" );
update_source_info($pkg);
print "$name: registered as failed\n" if $verbose;
$pkg->{'package'} = $name;
delete $pkg->{'builder'};
delete $pkg->{'depends'};
- delete $pkg->{'buildpri'};
delete $pkg->{'binary_nmu_version'};
delete $pkg->{'binary_nmu_changelog'};
log_ta( $pkg, "--no-build" );
delete $pkg->{'depends'};
delete $pkg->{'binary_nmu_version'};
delete $pkg->{'binary_nmu_changelog'};
+ delete $pkg->{'buildpri'};
} elsif ($binNMUver <= $pkg->{'binary_nmu_version'}) {
print "$name: already building binNMU $pkg->{'binary_nmu_version'}\n";
return;
$pkg->{'binary_nmu_version'} = $binNMUver;
$pkg->{'binary_nmu_changelog'} = $fail_reason;
$pkg->{'notes'} = 'out-of-date';
- $pkg->{'buildpri'} = $pkg->{'permbuildpri'}
- if (defined $pkg->{'permbuildpri'});
+ delete $pkg->{'buildpri'};
if (defined $distributions{$distribution}{noadw}) {
change_state( \$pkg, 'Installed' );
} else {
$pkg->{'binary_nmu_version'} = $binNMUver;
$pkg->{'binary_nmu_changelog'} = $fail_reason;
$pkg->{'notes'} = 'out-of-date';
+ delete $pkg->{'buildpri'};
log_ta( $pkg, "--binNMU" );
update_source_info($pkg);
print "${name}: registered for binNMU $fullver\n" if $verbose;
return;
}
if ( $build_priority == 0 ) {
- delete $pkg->{'buildpri'}
- if $key eq 'permbuildpri' and defined $pkg->{'buildpri'}
- and $pkg->{'buildpri'} == $pkg->{$key};
delete $pkg->{$key};
} else {
- $pkg->{'buildpri'} = $build_priority
- if $key eq 'permbuildpri';
$pkg->{$key} = $build_priority;
}
update_source_info($pkg);
}
change_state( \$pkg, 'Dep-Wait' );
$pkg->{'builder'} = $user;
- if (defined $pkg->{'permbuildpri'}) {
- $pkg->{'buildpri'} = $pkg->{'permbuildpri'};
- } else {
- delete $pkg->{'buildpri'};
- }
my $deplist = parse_deplist( $pkg->{'depends'} );
my $new_deplist = parse_deplist( $fail_reason );
# add new dependencies, maybe overwriting old entries
}
$sectval{'unknown'} = -165;
- %catval = ( "none" => -20,
- "uploaded-fixed-pkg" => -19,
- "fix-expected" => -18,
- "reminder-sent" => -17,
- "nmu-offered" => -16,
- "easy" => -15,
- "medium" => -14,
- "hard" => -13,
- "compiler-error" => -12 );
}
sub sort_list_func {
my $map_funcs = {
'C' => ['<->', sub { return $_[0]->{'calprio'}; }],
'W' => ['<->', sub { return $_[0]->{'state_days'}; }],
- 'P' => ['<->', sub { return $_[0]->{'buildpri'}; }],
+ 'P' => ['<->', sub { return ($_[0]->{'buildpri'}//0) + ($_[0]->{'permbuildpri'}//0); }],
'p' => ['<=>', sub { return $prioval{$_[0]->{'priority'}//""}//0; }],
's' => ['<=>', sub { return $sectval{$_[0]->{'section'}//""}//0; }],
'n' => ['cmp', sub { return $_[0]->{'package'}; }],
'b' => ['cmp', sub { return $_[0]->{'builder'}; }],
'c' => ['<=>', sub { return ($_[0]->{'notes'}//"" =~ /^(out-of-date|partial)/) ? 0: ($_[0]->{'notes'}//"" =~ /^uncompiled/) ? 2 : 1; }],
- 'f' => ['<=>', sub { return $catval{ $_[0]->{'failed_category'} ? $_[0]->{'failed_category'}: "none" }; }],
'S' => ['<->', sub { return isin($_[0]->{'priority'}, qw(required important standard)); }],
'T' => ['<->', sub { return $_[0]->{'state_time'} % 86400;} ], # Fractions of a day
};
sub calculate_prio {
my $priomap = $yamlmap->{priority};
my $pkg = shift;
- my @s=split("/", $pkg->{'section'});
+ my @s=split("/", $pkg->{'section'}//"");
$pkg->{'component'} = $s[0] if $s[1];
$pkg->{'component'} ||= 'main';
$pkg->{'calprio'} = 0;
no warnings;
my $c = "$pkg->{'priority'}:$pkg->{'notes'}";
$c .= ":PREV-FAILED" if $pkg->{'previous_state'} && $pkg->{'previous_state'} =~ /^Failed/;
- $c .= ":bp{" . $pkg->{'buildpri'} . "}" if defined $pkg->{'buildpri'};
+ $c .= ":bp{" . (($pkg->{'buildpri'}//0)+($pkg->{'permbuildpri'}//0)) . "}" if (($pkg->{'buildpri'}//0)+($pkg->{'permbuildpri'}//0));
$c .= ":binNMU{" . $pkg->{'binary_nmu_version'} . "}" if defined $pkg->{'binary_nmu_version'};
$c .= ":calprio{". $pkg->{'calprio'}."}";
$c .= ":days{". $pkg->{'state_days'}."}";
my %scnt;
my $ctime = time;
- my $db = get_all_source_info(state => $state, user => $user, category => $category, list_min_age => $list_min_age);
+ my $db = get_all_source_info(state => $state, user => $user, list_min_age => $list_min_age);
foreach $name (keys %$db) {
next if $name =~ /^_/;
push @list, calculate_prio($db->{$name});
undef $printformat if ($ownprintformat && $ownprintformat eq 'none');
foreach $pkg (sort sort_list_func @list) {
+ no warnings;
if ($printformat) {
print print_format($printformat, $pkg, {'cnt' => $cnt, 'scnt' => \%scnt})."\n";
++$cnt;
if $pkg->{'state'} ne "Needs-Build";
print print_format(" [%X]\n", $pkg, {});
print " Reasons for failing:\n",
- " [Category: ",
- defined $pkg->{'failed_category'} ? $pkg->{'failed_category'} : "none",
- "]\n ",
join("\n ",split("\n",$pkg->{'failed'})), "\n"
if $pkg->{'state'} =~ /^Failed/;
print " Dependencies: $pkg->{'depends'}\n"
'bd_problem' => 'BD-Problem',
'binary_nmu_changelog' => 'Binary-NMU-Changelog', 'binary_nmu_version' => 'Binary-NMU-Version',
'buildpri' => 'BuildPri', 'depends' => 'Depends', 'failed' => 'Failed',
- 'failed_category' => 'Failed-Category', 'notes' => 'Notes',
+ 'notes' => 'Notes',
'distribution' => 'Distribution', 'old_failed' => 'Old-Failed',
'permbuildpri' => 'PermBuildPri', 'rel' => 'Rel',
'calprio' => 'CalculatedPri', 'state_days' => 'State-Days', 'state_time' => 'State-Time',
}
sub forget_packages {
+ no warnings;
my( $name, $pkg, $key, $data );
foreach $name (@_) {
($pkg->{'failed'} // ""). "\n" .
($pkg->{'old_failed'} // "");
delete $pkg->{'failed'};
- delete $pkg->{'failed_category'};
}
if (defined($$state) and $$state eq 'BD-Uninstallable') {
delete $pkg->{'bd_problem'};
sub get_readonly_source_info {
my $name = shift;
# SELECT FLOOR(EXTRACT('epoch' FROM age(localtimestamp, '2010-01-22 23:45')) / 86400) -- change to that?
- my $q = "SELECT rel, priority, state_change, permbuildpri, section, buildpri, failed, state, binary_nmu_changelog, bd_problem, version, package, distribution, installed_version, notes, failed_category, builder, old_failed, previous_state, binary_nmu_version, depends, extract(days from date_trunc('days', now() - state_change)) as state_days, floor(extract(epoch from now()) - extract(epoch from state_change)) as state_time"
+ my $q = "SELECT rel, priority, state_change, permbuildpri, section, buildpri, failed, state, binary_nmu_changelog, bd_problem, version, package, distribution, installed_version, notes, builder, old_failed, previous_state, binary_nmu_version, depends, extract(days from date_trunc('days', now() - state_change)) as state_days, floor(extract(epoch from now()) - extract(epoch from state_change)) as state_time"
. ", (SELECT max(build_time) FROM ".pkg_history_table_name()." WHERE pkg_history.package = packages.package AND pkg_history.distribution = packages.distribution AND result = 'successful') AS successtime"
. ", (SELECT max(build_time) FROM ".pkg_history_table_name()." WHERE pkg_history.package = packages.package AND pkg_history.distribution = packages.distribution ) AS anytime"
. ", extra_depends, extra_conflicts, build_arch_all"
sub get_all_source_info {
my %options = @_;
- my $q = "SELECT rel, priority, state_change, permbuildpri, section, buildpri, failed, state, binary_nmu_changelog, bd_problem, version, package, distribution, installed_version, notes, failed_category, builder, old_failed, previous_state, binary_nmu_version, depends, extract(days from date_trunc('days', now() - state_change)) as state_days, floor(extract(epoch from now()) - extract(epoch from state_change)) as state_time"
+ my $q = "SELECT rel, priority, state_change, permbuildpri, section, buildpri, failed, state, binary_nmu_changelog, bd_problem, version, package, distribution, installed_version, notes, builder, old_failed, previous_state, binary_nmu_version, depends, extract(days from date_trunc('days', now() - state_change)) as state_days, floor(extract(epoch from now()) - extract(epoch from state_change)) as state_time"
# . ", (SELECT max(build_time) FROM ".pkg_history_table_name()." WHERE pkg_history.package = packages.package AND pkg_history.distribution = packages.distribution AND result = 'successful') AS successtime"
# . ", (SELECT max(build_time) FROM ".pkg_history_table_name()." WHERE pkg_history.package = packages.package AND pkg_history.distribution = packages.distribution ) AS anytime"
. ", successtime.build_time as successtime, anytime.build_time as anytime, extra_depends, extra_conflicts"
push @args, $options{user};
}
- if ($options{category}) {
- $q .= ' AND failed_category <> ? AND upper(state) = ? ';
- push @args, $options{category};
- push @args, "FAILED";
- }
-
if ($options{list_min_age} && $options{list_min_age} > 0) {
$q .= ' AND age(state_change) > ? ';
push @args, $options{list_min_age} . " days";
'old_failed = ?, ' .
'binary_nmu_version = ?, ' .
'binary_nmu_changelog = ?, ' .
- 'failed_category = ?, ' .
'permbuildpri = ?, ' .
'buildpri = ?, ' .
'depends = ?, ' .
$pkg->{'old_failed'},
$pkg->{'binary_nmu_version'},
$pkg->{'binary_nmu_changelog'},
- $pkg->{'failed_category'},
$pkg->{'permbuildpri'},
$pkg->{'buildpri'},
$pkg->{'depends'},
foreach my $name (keys %$srcs) {
next if $name eq '_binary';
- # state = installed, out-of-date, uncompiled, not-for-us, auto-not-for-us
+ # state = installed, out-of-date, uncompiled, packages-arch-specific, overwritten-by-arch-all, arch-not-in-arch-list, arch-all-only
my $pkgs = $srcs->{$name};
+ next if isin($pkgs->{'status'}, qw <arch-all-only>);
my $pkg = $db->{$name};
unless ($pkg) {
- next SRCS if $pkgs->{'status'} eq 'not-for-us';
+ next SRCS if $pkgs->{'status'} eq 'packages-arch-specific';
my $logstr = sprintf("merge-v3 %s %s_%s (%s, %s):", $vars->{'time'}, $name, $pkgs->{'version'}, $vars->{'arch'}, $vars->{'suite'});
# does at least one binary exist in the database and is more recent - if so, we're probably just outdated, ignore the source package
}
$pkg->{'package'} = $name;
}
+ $pkg->{'version'} ||= "";
+ $pkg->{'state'} ||= "";
my $logstr = sprintf("merge-v3 %s %s_%s", $vars->{'time'}, $name, $pkgs->{'version'}).
($pkgs->{'binnmu'} ? ";b".$pkgs->{'binnmu'} : "").
sprintf(" (%s, %s, previous: %s", $vars->{'arch'}, $vars->{'suite'}, $pkg->{'version'}//"").
($pkg->{'binary_nmu_version'} ? ";b".$pkg->{'binary_nmu_version'} : "").
- ", $pkg->{'state'}):";
+ ", $pkg->{'state'}".($pkg->{'notes'} ? "/".$pkg->{'notes'} : "")."):";
if (isin($pkgs->{'status'}, qw (installed related)) && $pkgs->{'version'} eq $pkg->{'version'} && ($pkgs->{'binnmu'}//0) < int($pkg->{'binary_nmu_version'}//0)) {
$pkgs->{'status'} = 'out-of-date';
}
- if (isin($pkgs->{'status'}, qw (installed related auto-not-for-us))) {
+ if (isin($pkgs->{'status'}, qw <installed related arch-not-in-arch-list packages-arch-specific overwritten-by-arch-all arch-all-only>)) {
my $change = 0;
- my $tstate = {'installed' => 'Installed', 'related' => 'Installed', 'auto-not-for-us' => 'Auto-Not-For-Us'}->{$pkgs->{'status'}};
+ my $tstate = {'installed' => 'Installed', 'related' => 'Installed',
+ 'arch-not-in-arch-list' => 'Auto-Not-For-Us', 'packages-arch-specific' => 'Auto-Not-For-Us', 'overwritten-by-arch-all' => 'Auto-Not-For-Us', 'arch-all-only' => 'Auto-Not-For-Us',
+ }->{$pkgs->{'status'}};
next if isin( $pkg->{'state'}, qw<Not-For-Us Failed Failed-Removed Dep-Wait Dep-Wait-Removed>) && isin( $tstate, qw<Auto-Not-For-Us>);
# if the package is currently current, the status is Installed, not not-for-us
if ($pkg->{'state'} ne $tstate) {
$change++;
}
}
- if (isin($pkgs->{'status'}, qw (related)) and $pkg->{'notes'} ne "related") {
- $pkg->{'notes'} = "related";
- $change++;
+ if (isin($pkgs->{'status'}, qw <related packages-arch-specific overwritten-by-arch-all arch-not-in-arch-list arch-all-only>)) {
+ my $tnotes = $pkgs->{'status'};
+ if (($pkg->{'notes'}//"") ne $tnotes) {
+ $pkg->{'notes'} = $tnotes;
+ $change++;
+ }
}
if ($change) {
print "$logstr set to $tstate/".($pkg->{'notes'}//"")."\n" if $verbose || $simulate;
next;
}
- if ($pkgs->{'status'} eq 'not-for-us') {
- next if isin( $pkg->{'state'}, qw(Not-For-Us Installed Failed-Removed));
-
- if (isin( $pkg->{'state'}, qw(Failed Build-Attempted Built))) {
- change_state( \$pkg, "Failed-Removed" );
- log_ta( $pkg, "--merge-v3: Failed-Removed" ) unless $simulate;
- update_source_info($pkg) unless $simulate;
- print "$logstr (virtually) deleted from database\n" if $verbose || $simulate;
- next;
- }
-
- print "$logstr should delete (not-for-us according to P-a-s)\n" if $verbose || $simulate || 1; # not implemented yet on purpose
- next;
- }
-
# only uncompiled / out-of-date are left, so check if anything new
if (!(isin($pkgs->{'status'}, qw (uncompiled out-of-date)))) {
print "$logstr package in unknown state: $pkgs->{'status'}\n";
delete $pkg->{'builder'};
delete $pkg->{'binary_nmu_version'} unless $pkgs->{'binnmu'};
delete $pkg->{'binary_nmu_changelog'} unless $pkgs->{'binnmu'};
+ delete $pkg->{'buildpri'};
log_ta( $pkg, "--merge-v3: needs-build" ) unless $simulate;
update_source_info($pkg) unless $simulate;
print "$logstr set to needs-builds\n" if $simulate || $verbose;
projects / wannabuild.git / blobdiff