X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=bin%2Fwanna-build;h=5b3afb15c92017c2ab9c8f2e527a984b08cbad8c;hb=88c8108d4b3e3e77d8cdd8ad1b191c80b274272f;hp=99bd7a26cc28861dc336120b32ed002d991b1656;hpb=9ef340664f076600ac35566d6a91911903ea3d0e;p=wannabuild.git

diff --git a/bin/wanna-build b/bin/wanna-build
index 99bd7a2..5b3afb1 100755
--- a/bin/wanna-build
+++ b/bin/wanna-build
@@ -3,6 +3,7 @@
 # wanna-build: coordination script for Debian buildds
 # Copyright (C) 1998 Roman Hodek <Roman.Hodek@informatik.uni-erlangen.de>
 # Copyright (C) 2005-2008 Ryan Murray <rmurray@debian.org>
+# Copyright (C) 2010      Andreas Barth <aba@not.so.argh.org>
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License as
@@ -31,7 +32,6 @@ die "dbbase is empty\n" if ! $dbbase;
 die "transactlog is empty\n" if ! $transactlog;
 die "mailprog binary $conf::mailprog does not exist or isn't executable\n"
 	if !-x $conf::mailprog;
-die "no distributions defined\n" if ! %distributions;
 package main;
 
 use strict;
@@ -39,8 +39,8 @@ use POSIX;
 use FileHandle;
 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;
@@ -49,6 +49,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,
@@ -58,11 +59,14 @@ 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,
+    %distributions, %distribution_aliases
     );
 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/";
@@ -81,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",
@@ -109,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;
@@ -132,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, 
@@ -205,10 +209,14 @@ 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" },
 	 "manual-edit"  => { mode => "manual-edit" },
+	 "distribution-architectures" => { mode => "distribution-architectures" },
+	 "distribution-aliases" => { mode => "distribution-aliases" },
 	 );
 
 while( @ARGV && $ARGV[0] =~ /^-/ ) {
@@ -252,9 +260,51 @@ while( @ARGV && $ARGV[0] =~ /^-/ ) {
 	}
 }
 
+my $dbh;
+
+END {
+	if (defined $dbh)
+	{
+		$dbh->disconnect or warn $dbh->errstr;
+	}
+}
+
+my $schema_suffix = '';
+$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';
+}
+else
+{
+	$dbh = DBI->connect("DBI:Pg:service=wanna-build-privileged") || 
+		die "FATAL: Cannot open database: $DBI::errstr\n";
+}
+
+# TODO: This shouldn't be needed, file a bug.
+$dbh->{pg_server_prepare} = 0;
+
+$dbh->begin_work or die $dbh->errstr;
+
+my $q = 'SELECT distribution, public, auto_dep_wait FROM distributions';
+my $rows = $dbh->selectall_hashref($q, 'distribution');
+foreach my $name (keys %$rows) {
+	$distributions{$name} = {};
+	$distributions{$name}->{'noadw'} = 1 if !($rows->{$name}->{'auto_dep_wait'});
+	$distributions{$name}->{'hidden'} = 1 if !($rows->{$name}->{'public'});
+}
+
+$q = 'SELECT alias, distribution FROM distribution_aliases';
+$rows = $dbh->selectall_hashref($q, 'alias');
+foreach my $name (keys %$rows) {
+	$distribution_aliases{$name} = $rows->{$name}->{'distribution'};
+}
+$distribution = $distribution_aliases{$distribution} if (isin($distribution, keys %distribution_aliases));
+
 $op_mode = $category ? "set-failed" : "set-building"
 	if !$op_mode; # default operation
-$distribution ||= "unstable";
+$distribution ||= "sid";
 if ($distribution eq 'any-priv') {
     $privmode = 'yes';
     $distribution = 'any';
@@ -268,7 +318,7 @@ if ($distribution) {
     my @dists = split(/[, ]+/, $distribution);
     foreach my $dist (@dists) {
         die "Bad distribution '$distribution'\n"
-	    if !isin($dist, keys %conf::distributions);
+	    if !isin($dist, keys %distributions);
     }
 }
 if (!isin ( $op_mode, qw(list) ) && ( !$distribution || $distribution =~ /[ ,]/)) {
@@ -293,7 +343,8 @@ if ($verbose) {
 
 if (!@ARGV && !isin( $op_mode, qw(list merge-quinn merge-partial-quinn import export
 				  merge-packages manual-edit
-				  merge-sources))) {
+				  merge-sources distribution-architectures
+				  distribution-aliases))) {
 	warn "No packages given.\n";
 	usage();
 }
@@ -352,32 +403,8 @@ if (not $yamlmap) {
 }
 $list_order = $yamlmap->{"list-order"}{$list_state} if !$list_order and $list_state;
 $list_order ||= $yamlmap->{"list-order"}{'default'};
-
-my $dbh;
-
-END {
-	if (defined $dbh)
-	{
-		$dbh->disconnect or warn $dbh->errstr;
-	}
-}
-
-my $schema_suffix = '';
-if (isin( $op_mode, qw(list info)) && $distribution !~ /security/ && !(not -t and $user =~ /-/) && !($privmode eq 'yes')) {
-	$dbh = DBI->connect("DBI:Pg:service=wanna-build") || 
-		die "FATAL: Cannot open database: $DBI::errstr\n";
-	$schema_suffix = '_public';
-}
-else
-{
-	$dbh = DBI->connect("DBI:Pg:service=wanna-build-privileged") || 
-		die "FATAL: Cannot open database: $DBI::errstr\n";
-}
-
-# TODO: This shouldn't be needed, file a bug.
-$dbh->{pg_server_prepare} = 0;
-
-$dbh->begin_work or die $dbh->errstr;
+$api //= $yamlmap->{"api"};
+$api //= 0;
 
 process();
 
@@ -508,16 +535,18 @@ sub process {
                         my @psrcs = &parse_argv( \@ARGV, '.');
                         use WB::QD;
                         my $srcs = WB::QD::readsourcebins($arch, $Pas, \@isrcs, \@ipkgs);
-                        my $psrcs = WB::QD::readsourcebins($arch, $Pas, \@psrcs, []);
-                        foreach my $k (keys %$$psrcs) {
-                            next if $$srcs->{$k};
-                            my $pkg = $$psrcs->{$k};
-                            $pkg->{'status'} = 'related';
-                            $$srcs->{$k} = $pkg;
+                        if (@psrcs) {
+                            my $psrcs = WB::QD::readsourcebins($arch, $Pas, \@psrcs, []);
+                            foreach my $k (keys %$$psrcs) {
+                                next if $$srcs->{$k};
+                                my $pkg = $$psrcs->{$k};
+                                $pkg->{'status'} = 'related';
+                                $$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 {
@@ -536,10 +565,18 @@ sub process {
 			export_db( $export_to );
 			last SWITCH;
 		};
+		/^distribution-architectures/ && do {
+			show_distribution_architectures();
+			last SWITCH;
+		};
+		/^distribution-aliases/ && do {
+			show_distribution_aliases();
+			last SWITCH;
+		};
 
 		die "Unexpected operation mode $op_mode\n";
 	}
-	if (not -t and $user =~ /-/) {
+	if ($recorduser) {
 		my $userinfo = get_user_info($user);
 		if (!defined $userinfo)
 		{
@@ -602,6 +639,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 );
+		}
 	}
 }
 
@@ -737,13 +777,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;
@@ -756,7 +796,7 @@ sub add_one_building {
             if ($api < 1) {
 		print "$name: NOT OK!\n  $reason\n";
             } else {
-		print "$name:\n    - status: not ok\n    - reason: \"$reason\"\n";
+		print "- $name:\n    - status: not ok\n    - reason: \"$reason\"\n";
             }
 	}
 }
@@ -1128,6 +1168,11 @@ sub set_one_binnmu {
 			$pkg->{'notes'} = 'out-of-date';
 			$pkg->{'buildpri'} = $pkg->{'permbuildpri'}
 				if (defined $pkg->{'permbuildpri'});
+			if (defined $distributions{$distribution}{noadw}) {
+				change_state( \$pkg, 'Installed' );
+			} else {
+				change_state( \$pkg, 'BD-Uninstallable' );
+			}
 		}
 		log_ta( $pkg, "--binNMU" );
 		update_source_info($pkg);
@@ -1149,7 +1194,7 @@ sub set_one_binnmu {
 		return;
 	}
 
-	if ($distribution eq "unstable") {
+	if (!defined $distributions{$distribution}{noadw}) {
 		change_state( \$pkg, 'BD-Uninstallable' );
 		$pkg->{'bd_problem'} = "Installability of build dependencies not tested yet";
 	}
@@ -1278,6 +1323,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;
@@ -2022,6 +2082,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};
@@ -2080,7 +2142,7 @@ sub info_packages {
 	my( $name, $pkg, $key, $dist );
 	my @firstkeys = qw(package version builder state section priority
 					   installed_version previous_state state_change);
-	my @dists = $info_all_dists ? keys %conf::distributions : ($distribution);
+	my @dists = $info_all_dists ? keys %distributions : ($distribution);
 	my %beautykeys = ( 'package' => 'Package', 'version' => 'Version', 'builder' => 'Builder',
 		'state' => 'State', 'section' => 'Section', 'priority' => 'Priority',
 		'installed_version' => 'Installed-Version', 'previous_state' => 'Previous-State',
@@ -2093,7 +2155,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 (@_) {
@@ -2305,10 +2369,10 @@ sub log_ta {
 		   "by $real_user as $user";
 	
         if ($simulate) {
-            printf ("update transactions: %s %s %s %s %s %s %s %s\n",
+            printf "update transactions: %s %s %s %s %s %s %s %s\n",
 		$pkg->{'package'}, $distribution,
 		$pkg->{'version'}, $action, $prevstate, $pkg->{'state'},
-                $real_user, $user);
+                $real_user, $user;
             return;
         }
 	$dbh->do('INSERT INTO ' . transactions_table_name() .
@@ -2399,24 +2463,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 {
@@ -2430,11 +2479,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 (<P>) {
             next unless /^Architecture/;
@@ -2463,9 +2512,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={};
@@ -2508,11 +2557,12 @@ sub wb_edos_builddebcheck {
 
 
 sub call_edos_depcheck {
+    return if $simulate_edos;
     my $args = shift;
     my $srcs = $args->{'srcs'};
     my $key;
     
-    return if defined ($conf::distributions{$distribution}{noadw}) && not defined $args->{'depwait'};
+    return if defined ($distributions{$distribution}{noadw}) && not defined $args->{'depwait'};
 
     # We need to check all of needs-build, as any new upload could make
     # something in needs-build have uninstallable deps
@@ -2522,13 +2572,13 @@ sub call_edos_depcheck {
     my $db = get_all_source_info();
     foreach $key (keys %$db) {
 	my $pkg = $db->{$key};
-        if (defined $pkg and isin($pkg->{'state'}, qw/Needs-Build BD-Uninstallable/) and not defined ($conf::distributions{$distribution}{noadw})) {
+        if (defined $pkg and isin($pkg->{'state'}, qw/Needs-Build BD-Uninstallable/) and not defined ($distributions{$distribution}{noadw})) {
 		$interesting_packages{$key} = undef;
 	}
         if (defined $pkg and isin($pkg->{'state'}, qw/Dep-Wait/) and defined $args->{'depwait'}) {
 		$interesting_packages_depwait{$key} = undef;
                 # we always check for BD-Uninstallability in depwait - could be that depwait is satisfied but package is uninstallable
-		$interesting_packages{$key} = undef unless defined ($conf::distributions{$distribution}{noadw});
+		$interesting_packages{$key} = undef unless defined ($distributions{$distribution}{noadw});
 	}
     }
     
@@ -2547,8 +2597,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";
@@ -2728,6 +2782,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,
@@ -2751,7 +2806,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 "
@@ -2799,8 +2854,29 @@ sub get_all_source_info {
 	return $db;
 }
 
+sub show_distribution_architectures {
+	my $q = 'SELECT distribution, spacecat_all(architecture) AS architectures '.
+		'FROM distribution_architectures '.
+		'GROUP BY distribution';
+	my $rows = $dbh->selectall_hashref($q, 'distribution');
+	foreach my $name (keys %$rows) {
+		print $name.': '.$rows->{$name}->{'architectures'}."\n";
+	}
+}
+
+sub show_distribution_aliases {
+	foreach my $alias (keys %distribution_aliases) {
+		print $alias.': '.$distribution_aliases{$alias}."\n";
+	}
+}
+
 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'});
@@ -2828,6 +2904,8 @@ sub update_source_info {
 			'buildpri = ?, ' .
 			'depends = ?, ' .
 			'rel = ?, ' .
+			'extra_depends = ?, ' .
+			'extra_conflicts = ?, ' .
 			'bd_problem = ? ' .
 			'WHERE package = ? AND distribution = ?',
 		undef,
@@ -2848,6 +2926,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;
@@ -2919,12 +2999,13 @@ sub parse_argv() {
 
 sub parse_all_v3() {
     my $srcs = shift;
+    my $vars = shift;
     my $db = get_all_source_info();
     my $binary = $srcs->{'_binary'};
 
     SRCS:
     foreach my $name (keys %$srcs) {
-        next if $name eq '_binaries';
+        next if $name eq '_binary';
 
         # state = installed, out-of-date, uncompiled, not-for-us
         my $pkgs = $srcs->{$name};
@@ -2932,32 +3013,48 @@ sub parse_all_v3() {
 
         unless ($pkg) {
             next SRCS if $pkgs->{'status'} eq 'not-for-us';
+            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) {
-                    print "merge-v3: skiping $name ($arch)\n" if $verbose || $simulate;
+                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 $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)) && $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))) {
+        if (isin($pkgs->{'status'}, qw (installed related))) {
+            my $change = 0;
             if ($pkg->{'state'} ne 'Installed') {
                 change_state( \$pkg, 'Installed');
-                $pkg->{'version'} = $pkgs->{'version'};
-                $pkg->{'installed_version'} = $pkgs->{'version'};
-                $pkg->{'binary_nmu_version'} = $pkgs->{'binnmu'};
-                $pkg->{'section'} = $pkgs->{'section'};
-                $pkg->{'priority'} = $pkgs->{'priority'};
-                if (isin($pkgs->{'status'}, qw (related))) {
-                    $pkg->{'notes'} = "related";
+                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' };
+            foreach my $k (keys %$attrs) {
+                if ($pkg->{$k} ne $pkgs->{$attrs->{$k}}) {
+                    $pkg->{$k} = $pkgs->{$attrs->{$k}};
+                    $change++;
                 }
-                print "merge-v3: set $name ($arch) to installed/".$pkg->{'notes'}."\n" if $verbose || $simulate;
+            }
+            if (isin($pkgs->{'status'}, qw (related)) and $pkg->{'notes'} ne "related") {
+                $pkg->{'notes'} = "related";
+                $change++;
+            }
+            if ($change) {
+                print "$logstr set to installed/".$pkg->{'notes'}."\n" if $verbose || $simulate;
                 log_ta( $pkg, "--merge-v3: installed" ) unless $simulate;
                 update_source_info($pkg) unless $simulate;
             }
@@ -2971,18 +3068,23 @@ sub parse_all_v3() {
                 change_state( \$pkg, "Failed-Removed" );
 		log_ta( $pkg, "--merge-v3: Failed-Removed" ) unless $simulate;
 		update_source_info($pkg) unless $simulate;
-                print "$name ($pkg->{'version'}): (virtually) deleted from database\n" if $verbose || $simulate;
+                print "$logstr (virtually) deleted from database\n" if $verbose || $simulate;
                 next;
             }
 
-            print "should delete $name (not-for-us)\n" if $verbose || $simulate || 1; # not implemented yet on purpose
+            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
-        next if $pkgs->{'version'} eq $pkg->{'version'};
+        if (!(isin($pkgs->{'status'}, qw (uncompiled out-of-date)))) {
+            print "$logstr package in unknown state: $pkgs->{'status'}\n";
+            next SRCS;
+        }
+        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));
 
-        print "should set $name to needs-builds\n" if $simulate;
         if (defined( $pkg->{'state'} ) && isin( $pkg->{'state'}, qw(Building Built Build-Attempted))) {
             send_mail( $pkg->{'builder'},
                 "new version of $name (dist=$distribution)",
@@ -2992,7 +3094,7 @@ sub parse_all_v3() {
                 "compiling $name yet, you can stop it to save some work.\n".
                 "Just to inform you...\n".
                 "(This is an automated message)\n" ) unless $simulate;
-	    print "$name: new version ($pkgs->{'version'}) while building $pkg->{'version'} -- sending mail to builder ($pkg->{'builder'})\n"
+	    print "$logstr new version while building $pkg->{'version'} -- sending mail to builder ($pkg->{'builder'})\n"
 				  if $verbose || $simulate;
 	    }
         change_state( \$pkg, 'Needs-Build');
@@ -3003,20 +3105,21 @@ 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 "$name ($pkgs->{'version'} / $arch) needs rebuilding now.\n" if $verbose || $simulate;
+        print "$logstr set to needs-builds\n" if $simulate || $verbose;
     }
 
     foreach my $name (keys %$db) {
         next if $srcs->{$name};
         my $pkg = $db->{$name};
+        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;
-	print "$name ($pkg->{'version'} / $arch) deleted from database\n" if $verbose || $simulate;
+	print "$logstr deleted from database\n" if $verbose || $simulate;
         del_source_info($name) unless $simulate;
         delete $db->{$name};
     }