X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=bin%2Fwanna-build;h=3ce374f68da2ea271193796f271ec10a1e83f1d6;hb=225bc59dd7c597d8a1e35d54fc15ed73a2b5b1e8;hp=f8d572142fdc6037360249b3b6496718d476a00d;hpb=cf7212491a441c8a2d2c4dde37d712af3d7408ed;p=wannabuild.git diff --git a/bin/wanna-build b/bin/wanna-build index f8d5721..3ce374f 100755 --- a/bin/wanna-build +++ b/bin/wanna-build @@ -42,6 +42,7 @@ use File::Copy; use DBI; use lib '/org/wanna-build/bin'; use lib '/org/wanna-build/lib'; +#use lib 'lib'; use WannaBuild; use YAML::Tiny; use Data::Dumper; @@ -50,6 +51,7 @@ use String::Format; use Date::Parse; use List::Util qw[max]; use Dpkg::Version qw(vercmp); # TODO: change this for running with squeeze dpkg +use Dpkg::Deps; # TODO: same our ($verbose, $mail_logs, $list_order, $list_state, $curr_date, $op_mode, $user, $real_user, $distribution, @@ -59,11 +61,12 @@ our ($verbose, $mail_logs, $list_order, $list_state, $category, %catval, %short_category, $short_date, $list_min_age, $dbbase, @curr_time, $build_priority, %new_vers, $binNMUver, %merge_srcvers, %merge_binsrc, - $printformat, $ownprintformat, $privmode + $printformat, $ownprintformat, $privmode, $extra_depends, $extra_conflicts ); our $Pas = '/org/buildd.debian.org/etc/packages-arch-specific/Packages-arch-specific'; our $simulate = 0; -our $api = 0; # allow buildds to specify an different api +our $simulate_edos = 0; +our $api = undef; # allow buildds to specify an different api # global vars $ENV{'PATH'} = "/bin:/usr/bin:/usr/local/bin:/org/wanna-build/bin/"; @@ -82,9 +85,6 @@ my %prognames = ( "uploaded-build" => "set-uploaded", "give-back-build" => "set-needs-build", "dep-wait-build" => "set-dep-wait", "forget-build" => "forget", - "merge-quinn" => "merge-quinn", - "merge-packages" => "merge-packages", - "merge-sources" => "merge-sources", "build-info" => "info" ); %short_category = ( u => "uploaded-fixed-pkg", @@ -110,6 +110,8 @@ elsif ($progname =~ /^list-(.*)$/) { my %options = (# flags simulate => { flag => \$simulate }, # this is not supported by all operations (yet)! + "simulate-edos" => { flag => \$simulate_edos }, + "simulate-all" => { code => sub { $simulate = 1; $simulate_edos = 1; } }, api => { arg => \$api, code => sub { # official apis are numeric die "$api isn't numeric" unless int($api) eq $api; @@ -133,13 +135,14 @@ my %options = "dep-wait" => { mode => "set-dep-wait" }, forget => { mode => "forget" }, 'forget-user' => { mode => 'forget-user' }, - "merge-quinn" => { mode => "merge-quinn" }, - "merge-partial-quinn" => { mode => "merge-partial-quinn" }, - "merge-packages" => { mode => "merge-packages" }, - "merge-sources" => { mode => "merge-sources" }, + update => { mode => "set-update" }, + #"merge-quinn" => { mode => "merge-quinn" }, + #"merge-partial-quinn" => { mode => "merge-partial-quinn" }, + #"merge-packages" => { mode => "merge-packages" }, + #"merge-sources" => { mode => "merge-sources" }, "pretend-avail" => { short => "p", mode => "pretend-avail" }, - "merge-all" => { mode => "merge-all" }, - "merge-all-secondary" => { mode => "merge-all-secondary" }, + #"merge-all" => { mode => "merge-all" }, + #"merge-all-secondary" => { mode => "merge-all-secondary" }, "merge-v3" => { mode => "merge-v3" }, info => { short => "i", mode => "info" }, 'binNMU' => { mode => 'set-binary-nmu', arg => \$binNMUver, @@ -206,6 +209,8 @@ my %options = "format" => { arg => \$printformat }, "own-format" => { arg => \$ownprintformat }, "Pas" => { arg => \$Pas }, + "extra-depends"=> { arg => \$extra_depends }, + "extra-conflicts"=> { arg => \$extra_conflicts }, # special actions export => { arg => \$export_to, mode => "export" }, import => { arg => \$import_from, mode => "import" }, @@ -353,6 +358,8 @@ if (not $yamlmap) { } $list_order = $yamlmap->{"list-order"}{$list_state} if !$list_order and $list_state; $list_order ||= $yamlmap->{"list-order"}{'default'}; +$api //= $yamlmap->{"api"}; +$api //= 0; my $dbh; @@ -364,7 +371,7 @@ END { } my $schema_suffix = ''; -if (isin( $op_mode, qw(list info)) && $distribution !~ /security/ && !(not -t and $user =~ /-/) && !($privmode eq 'yes')) { +if (isin( $op_mode, qw(list info)) && $distribution !~ /security/ && !(not -t and $user =~ /buildd-/) && !($privmode eq 'yes')) { $dbh = DBI->connect("DBI:Pg:service=wanna-build") || die "FATAL: Cannot open database: $DBI::errstr\n"; $schema_suffix = '_public'; @@ -518,9 +525,9 @@ sub process { $$srcs->{$k} = $pkg; } } - parse_all_v3($$srcs); + parse_all_v3($$srcs, {'arch' => $arch, 'suite' => $distribution, 'time' => $curr_date}); @bpkgs = @ipkgs unless @bpkgs; - call_edos_depcheck( {'arch' => $arch, 'pkgs' => @bpkgs, 'srcs' => $$srcs, 'depwait' => 1 }); + call_edos_depcheck( {'arch' => $arch, 'pkgs' => \@bpkgs, 'srcs' => $$srcs, 'depwait' => 1 }); last SWITCH; }; /^import/ && do { @@ -542,7 +549,7 @@ sub process { die "Unexpected operation mode $op_mode\n"; } - if (not -t and $user =~ /-/) { + if (not -t and $user =~ /buildd-/) { my $userinfo = get_user_info($user); if (!defined $userinfo) { @@ -605,6 +612,9 @@ sub add_packages { elsif ($op_mode eq "set-binary-nmu") { set_one_binnmu( $name, $version ); } + elsif ($op_mode eq "set-update") { + set_one_update( $name, $version ); + } } } @@ -740,13 +750,13 @@ sub add_one_building { } print "$name: $ok\n" if $verbose; } else { - print "- $name:\n"; - print " - status: ok\n"; - if ($pkg->{'binary_nmu_version'}) { - print " - binNMU:\n"; - print " - version: $pkg->{'binary_nmu_version'}\n"; - print " - changelog: $pkg->{'binary_nmu_changelog'}\n"; - } + print "- $name:\n"; + print " - status: ok\n"; + printf " - pkg-ver: %s_%s\n", $name, $version; + print " - binNMU: $pkg->{'binary_nmu_version'}\n" if $pkg->{'binary_nmu_version'}; + print " - extra-changelog: $pkg->{'binary_nmu_changelog'}\n" if $pkg->{'binary_nmu_changelog'} && $pkg->{'binary_nmu_version'}; + print " - extra-depends: $pkg->{'extra_depends'}\n" if $pkg->{'extra_depends'}; + print " - extra-conflicts: $pkg->{'extra_conflicts'}\n" if $pkg->{'extra_conflicts'}; } change_state( \$pkg, 'Building' ); $pkg->{'package'} = $name; @@ -1281,6 +1291,21 @@ sub add_one_depwait { print "$name: registered as waiting for dependencies\n" if $verbose; } +sub set_one_update { + my $name = shift; + my $version = shift; + my $pkg = get_source_info($name); + + if (!defined($pkg)) { + print "$name: not registered yet.\n"; + return; + } + $pkg->{'version'} =~ s/\+b[0-9]+$//; + + log_ta( $pkg, "--update" ); + update_source_info($pkg); +} + sub parse_sources { my %pkgs; @@ -2025,6 +2050,8 @@ sub list_packages { # filter components @list = grep { my $i = $_->{'component'}; grep { $i eq $_ } split /[, ]+/, $yamlmap->{"restrict"}{'component'} } @list; + # extra depends / conflicts only from api 1 on + @list = grep { !$_->{'extra_depends'} and !$_->{'extra_conflicts'} } @list if $api < 1 ; # first adjust ownprintformat, then set printformat accordingly $printformat ||= $yamlmap->{"format"}{$ownprintformat}; @@ -2096,7 +2123,9 @@ sub info_packages { 'permbuildpri' => 'PermBuildPri', 'rel' => 'Rel', 'calprio' => 'CalculatedPri', 'state_days' => 'State-Days', 'successtime' => 'Success-build-time', - 'anytime' => 'Build-time' + 'anytime' => 'Build-time', + 'extra_depends' => 'Extra-Dependencies', + 'extra_conflicts' => 'Extra-Conflicts', ); foreach $name (@_) { @@ -2402,24 +2431,9 @@ sub build_deplist { } -sub greparch { - my ($gapkglong, $gaarch) = @_; - my ($gapkg, $gaarchs) = split(/ \[/, $gapkglong); - if ($gaarchs) { - $_ = $gapkg; - chop($gaarchs); # take away the ] - my @gaarches = split(/ /, $gaarchs); - if (substr($gaarches[0], 0, 1) eq '!') { - return 0 if grep /^!$gaarch$/, @gaarches; - } else { # positive case - return 0 unless grep /^$gaarch$/, @gaarches; - } - }; - return 1; -} sub filterarch { - my $faarch = $_[1]; - return join(', ', grep { &greparch($_, $faarch) } split(/, ?/, $_[0])); + return "" unless $_[0]; + return Dpkg::Deps::parse($_[0], ("reduce_arch" => 1, "host_arch" => $_[1]))->dump(); } sub wb_edos_builddebcheck { @@ -2433,11 +2447,11 @@ sub wb_edos_builddebcheck { my $sourceprefix="source---"; my $architecture=$args->{'arch'}; my $edosoptions = "-failures -explain -quiet"; - my @packagefiles = $args->{'pkgs'}; + my $packagefiles = $args->{'pkgs'}; my $sourcesfile = $args->{'src'}; my $packagearch=""; - foreach my $packagefile (@packagefiles) { + foreach my $packagefile (@$packagefiles) { open(P,$packagefile); while (

) { next unless /^Architecture/; @@ -2466,9 +2480,9 @@ sub wb_edos_builddebcheck { } } - print "calling: edos-debcheck $edosoptions < $sourcesfile ".join('', map {" '-base FILE' ".$_ } @packagefiles)."\n"; + print "calling: edos-debcheck $edosoptions < $sourcesfile ".join('', map {" '-base FILE' ".$_ } @$packagefiles)."\n"; open(RESULT, '-|', - "edos-debcheck $edosoptions < $sourcesfile ".join('', map {" '-base FILE' ".$_ } @packagefiles)); + "edos-debcheck $edosoptions < $sourcesfile ".join('', map {" '-base FILE' ".$_ } @$packagefiles)); my $explanation=""; my $result={}; @@ -2511,6 +2525,7 @@ sub wb_edos_builddebcheck { sub call_edos_depcheck { + return if $simulate_edos; my $args = shift; my $srcs = $args->{'srcs'}; my $key; @@ -2550,8 +2565,12 @@ sub call_edos_depcheck { 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); + $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); + $u = $u ? ($uu ? "$u, $uu" : $u) : $uu; print $SOURCES "Conflicts: $u\n" if $u; print $SOURCES "Architecture: all\n"; print $SOURCES "\n"; @@ -2731,6 +2750,7 @@ sub get_readonly_source_info { 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" . ", (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" . " FROM " . table_name() . ' WHERE package = ? AND distribution = ?'; my $pkg = $dbh->selectrow_hashref( $q, @@ -2754,7 +2774,7 @@ sub get_all_source_info { 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" # . ", (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" + . ", successtime.build_time as successtime, anytime.build_time as anytime, extra_depends, extra_conflicts" . " FROM " . table_name() . " left join ( " . "select distinct on (package, distribution) build_time, package, distribution from ".pkg_history_table_name()." where result = 'successful' order by package, distribution, timestamp " @@ -2804,6 +2824,11 @@ sub get_all_source_info { sub update_source_info { my $pkg = shift; + $pkg->{'extra_depends'} = $extra_depends if defined $extra_depends; + undef $pkg->{'extra_depends'} unless $pkg->{'extra_depends'}; + $pkg->{'extra_conflicts'} = $extra_conflicts if defined $extra_conflicts; + undef $pkg->{'extra_conflicts'} unless $pkg->{'extra_conflicts'}; + print Dumper $pkg if $verbose and $simulate; return if $simulate; my $pkg2 = get_source_info($pkg->{'package'}); @@ -2831,6 +2856,8 @@ sub update_source_info { 'buildpri = ?, ' . 'depends = ?, ' . 'rel = ?, ' . + 'extra_depends = ?, ' . + 'extra_conflicts = ?, ' . 'bd_problem = ? ' . 'WHERE package = ? AND distribution = ?', undef, @@ -2851,6 +2878,8 @@ sub update_source_info { $pkg->{'buildpri'}, $pkg->{'depends'}, $pkg->{'rel'}, + $pkg->{'extra_depends'}, + $pkg->{'extra_conflicts'}, $pkg->{'bd_problem'}, $pkg->{'package'}, $distribution) or die $dbh->errstr; @@ -2922,6 +2951,7 @@ sub parse_argv() { sub parse_all_v3() { my $srcs = shift; + my $vars = shift; my $db = get_all_source_info(); my $binary = $srcs->{'_binary'}; @@ -2935,20 +2965,24 @@ sub parse_all_v3() { unless ($pkg) { next SRCS if $pkgs->{'status'} eq 'not-for-us'; - my $logstr = "merge-v3 ".$name." ($arch):"; + my $logstr = "merge-v3 $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 for my $bin (@{$pkgs->{'binary'}}) { - if ($binary->{$bin} and vercmp($pkgs->{'version'}, $binary->{$bin}) < 0) { + if ($binary->{$bin} and vercmp($pkgs->{'version'}, $binary->{$bin}->{'version'}) < 0) { print "$logstr skipped because binaries (assumed to be) overwritten\n" if $verbose || $simulate; next SRCS; } } $pkg->{'package'} = $name; } - my $logstr = "merge-v3 ".$name."_$pkgs->{'version'} ($arch, previous-state: $pkg->{'state'}):"; + my $logstr = "merge-v3 $vars->{'time'} ".$name."_$pkgs->{'version'}". + ($pkgs->{'binnmu'} ? ";b".$pkgs->{'binnmu'} : ""). + "($vars->{'arch'}, $vars->{'suite'}, previous: $pkg->{'version'}". + ($pkg->{'binary_nmu_version'} ? ";b".$pkg->{'binary_nmu_version'} : ""). + ", $pkg->{'state'}):"; - if (isin($pkgs->{'status'}, qw (installed related)) && $pkg->{'binary_nmu_version'} && $pkgs->{'binnmu'} < $pkg->{'binary_nmu_version'}) { + if (isin($pkgs->{'status'}, qw (installed related)) && $pkg->{'binary_nmu_version'} && $pkgs->{'binnmu'} < int($pkg->{'binary_nmu_version'})) { $pkgs->{'status'} = 'out-of-date'; } if (isin($pkgs->{'status'}, qw (installed related))) { @@ -2956,6 +2990,8 @@ sub parse_all_v3() { if ($pkg->{'state'} ne 'Installed') { change_state( \$pkg, 'Installed'); delete $pkg->{'depends'}; + delete $pkg->{'extra_depends'}; + delete $pkg->{'extra_conflicts'}; $change++; } my $attrs = { 'version' => 'version', 'installed_version' => 'version', 'binary_nmu_version' => 'binnmu', 'section' => 'section', 'priority' => 'priority' }; @@ -2965,7 +3001,7 @@ sub parse_all_v3() { $change++; } } - if (isin($pkgs->{'status'}, qw (related))) { + if (isin($pkgs->{'status'}, qw (related)) and $pkg->{'notes'} ne "related") { $pkg->{'notes'} = "related"; $change++; } @@ -2997,7 +3033,9 @@ sub parse_all_v3() { print "$logstr package in unknown state: $pkgs->{'status'}\n"; next SRCS; } - next if $pkgs->{'version'} eq $pkg->{'version'}; + next if $pkgs->{'version'} eq $pkg->{'version'} and $pkgs->{'binnmu'} >= int($pkg->{'binary_nmu_version'}); + next if $pkgs->{'version'} eq $pkg->{'version'} and !isin( $pkg->{'state'}, qw(Installed)); + next if isin( $pkg->{'state'}, qw(Not-For-Us Failed-Removed)); if (defined( $pkg->{'state'} ) && isin( $pkg->{'state'}, qw(Building Built Build-Attempted))) { send_mail( $pkg->{'builder'}, @@ -3019,8 +3057,8 @@ sub parse_all_v3() { $pkg->{'dep'} = $pkgs->{'depends'}; $pkg->{'conf'} = $pkgs->{'conflicts'}; delete $pkg->{'builder'}; - delete $pkg->{'binary_nmu_version'}; - delete $pkg->{'binary_nmu_changelog'}; + delete $pkg->{'binary_nmu_version'} unless $pkgs->{'binnmu'}; + delete $pkg->{'binary_nmu_changelog'} unless $pkgs->{'binnmu'}; 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; @@ -3029,7 +3067,7 @@ sub parse_all_v3() { foreach my $name (keys %$db) { next if $srcs->{$name}; my $pkg = $db->{$name}; - my $logstr = "merge-v3 ".$name."_$pkg->{'version'} ($arch, previous-state: $pkg->{'state'}):"; + my $logstr = "merge-v3 $vars->{'time'} ".$name."_$pkg->{'version'} ($vars->{'arch'}, $vars->{'suite'}, previous: $pkg->{'state'}):"; # package disappeared - delete change_state( \$pkg, 'deleted' ); log_ta( $pkg, "--merge-v3: deleted" ) unless $simulate;