X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=bin%2Fwanna-build;h=e16cdcc4c30c0a7597ce5bef27a1e98beafaa7f3;hb=6ed09bc542cd09e984b1da6b5b7a9cd90bdc23e8;hp=6124fb3914b53b0972ca9fa7d3eae86dadc64d89;hpb=ee46693fa80dcafcc98db9adeca3d74e039be8b7;p=wannabuild.git

diff --git a/bin/wanna-build b/bin/wanna-build
index 6124fb3..e16cdcc 100755
--- a/bin/wanna-build
+++ b/bin/wanna-build
@@ -51,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,
@@ -60,11 +61,13 @@ 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
+our $recorduser = undef;
 
 # global vars
 $ENV{'PATH'} = "/bin:/usr/bin:/usr/local/bin:/org/wanna-build/bin/";
@@ -83,9 +86,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",
@@ -111,6 +111,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;
@@ -134,13 +136,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, 
@@ -207,6 +210,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" },
@@ -354,6 +359,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;
 
@@ -365,7 +372,8 @@ END {
 }
 
 my $schema_suffix = '';
-if (isin( $op_mode, qw(list info)) && $distribution !~ /security/ && !(not -t and $user =~ /-/) && !($privmode eq 'yes')) {
+$recorduser //= (not -t and $user =~ /^buildd_/);
+if (isin( $op_mode, qw(list info)) && $distribution !~ /security/ && !$recorduser && !($privmode eq 'yes')) {
 	$dbh = DBI->connect("DBI:Pg:service=wanna-build") || 
 		die "FATAL: Cannot open database: $DBI::errstr\n";
 	$schema_suffix = '_public';
@@ -543,7 +551,7 @@ sub process {
 
 		die "Unexpected operation mode $op_mode\n";
 	}
-	if (not -t and $user =~ /-/) {
+	if ($recorduser) {
 		my $userinfo = get_user_info($user);
 		if (!defined $userinfo)
 		{
@@ -606,6 +614,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 );
+		}
 	}
 }
 
@@ -741,13 +752,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;
@@ -1282,6 +1293,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;
@@ -2026,6 +2052,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};
@@ -2097,7 +2125,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 (@_) {
@@ -2403,24 +2433,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 {
@@ -2512,6 +2527,7 @@ sub wb_edos_builddebcheck {
 
 
 sub call_edos_depcheck {
+    return if $simulate_edos;
     my $args = shift;
     my $srcs = $args->{'srcs'};
     my $key;
@@ -2551,8 +2567,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";
@@ -2732,6 +2752,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,
@@ -2755,7 +2776,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 "
@@ -2805,6 +2826,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'});
@@ -2832,6 +2858,8 @@ sub update_source_info {
 			'buildpri = ?, ' .
 			'depends = ?, ' .
 			'rel = ?, ' .
+			'extra_depends = ?, ' .
+			'extra_conflicts = ?, ' .
 			'bd_problem = ? ' .
 			'WHERE package = ? AND distribution = ?',
 		undef,
@@ -2852,6 +2880,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;
@@ -2954,7 +2984,7 @@ sub parse_all_v3() {
             ($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)) && $pkgs->{'version'} eq $pkg->{'version'} && $pkg->{'binary_nmu_version'} && $pkgs->{'binnmu'} < int($pkg->{'binary_nmu_version'})) {
                 $pkgs->{'status'} = 'out-of-date';
         }
         if (isin($pkgs->{'status'}, qw (installed related))) {
@@ -2962,6 +2992,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' };
@@ -3003,7 +3035,8 @@ 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))) {
@@ -3026,8 +3059,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;