X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=bin%2Fwanna-build;h=00ca7c46b30dabc73b6a2795f18d1914185b7020;hb=ef8f225313b320f298618c1e582e85cc2e3e4ee4;hp=4a2286010abff586275cd1e391761f2a00670483;hpb=fefb96bc171b01d22455c7919a5cae20e33da8f8;p=wannabuild.git diff --git a/bin/wanna-build b/bin/wanna-build index 4a22860..00ca7c4 100755 --- a/bin/wanna-build +++ b/bin/wanna-build @@ -53,7 +53,7 @@ our ($verbose, $mail_logs, $list_order, $list_state, $lock_for_pid, $transactional); # global vars -$ENV{'PATH'} = "/bin:/usr/bin:/usr/local/bin"; +$ENV{'PATH'} = "/bin:/usr/bin:/usr/local/bin:/org/wanna-build/bin/"; $verbose = 0; $mail_logs = ""; @curr_time = gmtime; @@ -138,7 +138,7 @@ my %options = if !isin( $list_state, qw(needs-build building uploaded built build-attempted failed installed dep-wait not-for-us all failed-removed - install-wait reupload-wait));} }, + install-wait reupload-wait bd-uninstallable));} }, # options with args dist => { short => "d", arg => \$distribution, @@ -188,7 +188,7 @@ my %options = export => { arg => \$export_to, mode => "export" }, "lock-for" => { arg => \$lock_for_pid, mode => "lock-for" }, "unlock-for" => { arg => \$lock_for_pid, mode => "unlock-for" }, - "act-on-behalve-of" => { arg => \$lock_for_pid }, + "act-on-behalf-of" => { arg => \$lock_for_pid }, "start-transaction" => { mode => "start-transaction" }, "commit-transaction" => { mode => "commit-transaction" }, "transactional" => { flag => \$transactional }, @@ -445,8 +445,8 @@ sub process { @ARGV = ( $ARGS[1] ); parse_quinn_diff(0); @ARGV = ( $ARGS[2] ); - my $build_deps = parse_sources(1); - call_edos_depcheck( $ARGS[0], $ARGS[2] ); + my $srcs = parse_sources(1); + call_edos_depcheck( $ARGS[0], $srcs ); clean_db(); last SWITCH; }; @@ -968,23 +968,31 @@ sub add_one_needsbuild { } $state = $pkg->{'State'}; - if ($state eq "Dep-Wait") { + if ($state eq "BD-Uninstallable") { if ($opt_override) { - print "$name: Forcing source dependency list to be cleared\n"; + print "$name: Forcing uninstallability mark to be removed. This is not permanent and might be reset with the next trigger run\n"; + + change_state( \$pkg, 'Needs-Build' ); + delete $pkg->{'Builder'}; + delete $pkg->{'Depends'}; + log_ta( $pkg, "--give-back" ); + $db{$name} = $pkg; + print "$name: given back\n" if $verbose; + return; } else { - print "$name: waiting for source dependencies. Skipping\n", + print "$name: has uninstallable build-dependencies. Skipping\n", " (use --override to clear dependency list and ", "give back anyway)\n"; return; } } - if ($state eq "BD-Uninstallable") { + elsif ($state eq "Dep-Wait") { if ($opt_override) { - print "$name: Forcing uninstallability mark to be removed\n"; + print "$name: Forcing source dependency list to be cleared\n"; } else { - print "$name: has uninstallable build-dependencies. Skipping\n", + print "$name: waiting for source dependencies. Skipping\n", " (use --override to clear dependency list and ", "give back anyway)\n"; return; @@ -1011,7 +1019,8 @@ sub add_one_needsbuild { "Skipping.\n"; return; } - change_state( \$pkg, 'Needs-Build' ); + change_state( \$pkg, 'BD-Uninstallable' ); + $pkg->{'BD-Problem'} = "Installability of build dependencies not tested yet"; delete $pkg->{'Builder'}; delete $pkg->{'Depends'}; log_ta( $pkg, "--give-back" ); @@ -1075,7 +1084,8 @@ sub set_one_binnmu { return; } - change_state( \$pkg, 'Needs-Build' ); + change_state( \$pkg, 'BD-Uninstallable' ); + $pkg->{'BD-Problem'} = "Installability of build dependencies not tested yet"; delete $pkg->{'Builder'}; delete $pkg->{'Depends'}; $pkg->{'Binary-NMU-Version'} = $binNMUver; @@ -1219,18 +1229,11 @@ sub parse_sources { next if (defined $srcver{$name} and version_less( $version, $srcver{$name} )); $srcver{$name} = $version; - if ($buildconf) { - $buildconf = join( ", ", map { "!$_" } split( /\s*,\s*/, $buildconf )); - if ($builddep) { - $builddep .= "," . $buildconf; - } else { - $builddep = $buildconf; - } - } - $pkgs{$name}{'dep'} = defined $builddep ? $builddep : ""; $pkgs{$name}{'ver'} = $version; $pkgs{$name}{'bin'} = $binaries; + $pkgs{$name}{'dep'} = $builddep; + $pkgs{$name}{'conf'} = $buildconf; my $pkg = $db{$name}; if (defined $pkg) { @@ -1258,6 +1261,15 @@ sub parse_sources { $pkg->{'Section'} = $section, $change++ if defined $section and (not defined($pkg->{'Section'}) or $pkg->{'Section'} ne $section); + + # Remove field from previous wanna-build versions + for (qw/Reason Build-Depends Build-Conflicts/) { + if (exists $pkg->{$_}) { + delete $pkg->{$_}; + $change++; + } + } + $db{$name} = $pkg if $change; } } @@ -1871,7 +1883,7 @@ sub list_packages { if $pkg->{'State'} =~ /^Failed/; print " Dependencies: $pkg->{'Depends'}\n" if $pkg->{'State'} eq "Dep-Wait"; - print " Reason: $pkg->{'Reason'}\n" + print " Reason: $pkg->{'BD-Problem'}\n" if $pkg->{'State'} eq "BD-Uninstallable"; print " Previous state was $pkg->{'Previous-State'} until ", "$pkg->{'State-Change'}\n" @@ -2212,7 +2224,7 @@ sub write_db { my $val = $ui->{$key}; $val =~ s/\n*$//; $val =~ s/^/ /mg; - $val =~ s/^ $/ ./mg; + $val =~ s/^ +$/ ./mg; print F "$key: $val\n"; } print F "\n"; @@ -2223,7 +2235,7 @@ sub write_db { my $val = $pkg->{$key}; $val =~ s/\n*$//; $val =~ s/^/ /mg; - $val =~ s/^ $/ ./mg; + $val =~ s/^ +$/ ./mg; print F "$key: $val\n"; } print F "\n"; @@ -2262,7 +2274,7 @@ sub change_state { delete $pkg->{'Failed-Category'}; } if (defined($$state) and $$state eq 'BD-Uninstallable') { - delete $pkg->{'Reason'}; + delete $pkg->{'BD-Problem'}; } $$state = $newstate; } @@ -2563,7 +2575,7 @@ sub get_unsatisfied_dep { sub call_edos_depcheck { my $packagesfile = shift; - my $sourcesfile = shift; + my $srcs = shift; my $key; return if defined ($conf::distributions{$distribution}{noadw}); @@ -2583,7 +2595,27 @@ sub call_edos_depcheck { #print "I would look at these sources with edos-depcheck:\n"; #print join " ", keys %interesting_packages,"\n"; - if (open(EDOS,"-|","wb-edos-builddebcheck", "-a", $arch, $packagesfile, $sourcesfile)) { + my $tmpfile_pattern = "/tmp/wanna-build-interesting-sources-$distribution.$$-"; + my ($tmpfile, $i); + for( $i = 0;; ++$i ) { + $tmpfile = $tmpfile_pattern . $i; + last if ! -e $tmpfile; + } + + open SOURCES, '>', $tmpfile or die "Could not open temporary file $tmpfile\n"; + for my $key (keys %interesting_packages) { + my $pkg = $db{$key}; + print SOURCES "Package: $key\n"; + print SOURCES "Version: $pkg->{'Version'}\n"; + print SOURCES "Build-Depends: $srcs->{$key}{'dep'}\n" if $srcs->{$key}{'dep'}; + print SOURCES "Build-Conflicts: $srcs->{$key}{'conf'}\n" if $srcs->{$key}{'conf'}; + print SOURCES "Architecture: all\n"; + print SOURCES "\n"; + } + close SOURCES; + + if (open(EDOS,"-|","wb-edos-builddebcheck", "-a", $arch, $packagesfile, $tmpfile)) + { local($/) = ""; # read in paragraph mode while( ) { my( $key, $reason ) ; @@ -2591,11 +2623,12 @@ sub call_edos_depcheck { /^Package:\s*(\S+)$/mi and $key = $1; /^Failed-Why:(([^\n]|\n ([^\n]|\.))*)$/msi and $reason = $1; $reason =~ s/^\s*//mg; + $reason ||= 'No reason given by edos-debcheck'; if (exists $interesting_packages{$key}) { $interesting_packages{$key} = $reason; } else { - print "TODO: edos reported a package we do not care about now" if $verbose; + #print "TODO: edos reported a package we do not care about now\n" if $verbose; } } close EDOS; @@ -2603,25 +2636,35 @@ sub call_edos_depcheck { print "ERROR: Could not run wb-edos-builddebcheck. I am continuing, assuming\n" . "all packages have installable build-dependencies." } + + unlink( $tmpfile ); for my $key (keys %interesting_packages) { my $pkg = $db{$key}; my $change = - (defined $interesting_packages{$key} && $pkg->{'State'} eq 'Needs-Build') || - (not defined $interesting_packages{$key} && $pkg->{'State'} eq 'BD-Uninstallable'); + (defined $interesting_packages{$key} and $pkg->{'State'} eq 'Needs-Build') || + (not defined $interesting_packages{$key} and $pkg->{'State'} eq 'BD-Uninstallable'); + my $problemchange = $interesting_packages{$key} ne $pkg->{'BD-Problem'}; if ($change) { if (defined $interesting_packages{$key}) { - $pkg->{'State'} = 'BD-Uninstallable'; - $pkg->{'Reason'} = $interesting_packages{$key}; change_state( \$pkg, 'BD-Uninstallable' ); + $pkg->{'BD-Problem'} = $interesting_packages{$key}; } else { - $pkg->{'State'} = 'Needs-Build'; change_state( \$pkg, 'Needs-Build' ); } + } + if ($problemchange) { + if (defined $interesting_packages{$key}) { + $pkg->{'BD-Problem'} = $interesting_packages{$key}; + } + } + if ($change) { log_ta( $pkg, "--merge-all" ); - $db{$key} = $pkg; print "edos-builddebchange changed state of ${key}_$pkg->{'Version'} to $pkg->{'State'}\n" if $verbose; } + if ($change || $problemchange) { + $db{$key} = $pkg; + } } } @@ -2647,7 +2690,10 @@ Options: a new version number (source-version + "+b") --give-back: Mark a package as ready to build that is in state Building, Built or Build-Attempted. To give back a package in state Failed, use - --override + --override. This command will actually put the package in state + BD-Uninstallable, until the installability of its Build-Dependencies + were verified. This happens at each call of --merge-all, usually + every 15 minutes. --merge-quinn: Merge quinn-diff output into database. --merge-packages: Merge Packages files into database. --pretend-avail: Pretend that given packages are available now and give @@ -2669,7 +2715,7 @@ Options: --export FILE: Export database to a ASCII file FILE --lock-for PID: Locks the database for the process with this pid --unlock-for PID: Unlocks the database for the process with this pid - --act-on-behalve-of PID: Ignores the log (if it is held by this pid) + --act-on-behalf-of PID: Ignores the lock (if it is held by this pid) --start-transaction: Creates a copy of the state of the database, for use with --transactional. This overrides any previous uncommited transaction. Should only be used after --lock-for