X-Git-Url: https://git.donarmstrong.com/?p=wannabuild.git;a=blobdiff_plain;f=bin%2Fwanna-build;h=28f2b1729650928f54a12586cddbb52d24177034;hp=8780000876d6b60da09f3fed56ae2d67cc43d593;hb=c97a76f09c3b8b7a92d458e1cfe322127e225cd2;hpb=82687dad4773036a4aa5100a6940758b6bcbf7ab

diff --git a/bin/wanna-build b/bin/wanna-build
index 8780000..28f2b17 100755
--- a/bin/wanna-build
+++ b/bin/wanna-build
@@ -19,8 +19,13 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #
+use strict;
+use warnings;
+use 5.010;
 
 package conf;
+
+use vars qw< $basedir $dbbase $transactlog $mailprog $buildd_domain >;
 # defaults
 $basedir ||= "/var/lib/debbuild";
 $dbbase ||= "build-db";
@@ -34,11 +39,11 @@ die "mailprog binary $conf::mailprog does not exist or isn't executable\n"
 	if !-x $conf::mailprog;
 package main;
 
-use strict;
 use POSIX;
 use FileHandle;
 use File::Copy;
 use DBI;
+use Getopt::Long qw ( :config gnu_getopt );
 use lib '/org/wanna-build/lib';
 #use lib 'lib';
 use WannaBuild;
@@ -48,7 +53,13 @@ use Hash::Merge qw ( merge );
 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::Version (); # import nothing
+if ( defined $Dpkg::Version::VERSION ) {
+    *vercmp = \&Dpkg::Version::version_compare;
+} else {
+    *vercmp = \&Dpkg::Version::vercmp;
+}
+
 use Dpkg::Deps; # TODO: same
 
 our ($verbose, $mail_logs, $list_order, $list_state,
@@ -57,7 +68,7 @@ our ($verbose, $mail_logs, $list_order, $list_state,
     %prioval, %sectval,
     $info_all_dists, $arch,
     $category, %catval, %short_category,
-    $short_date, $list_min_age, $dbbase, @curr_time,
+    $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,
     %distributions, %distribution_aliases
@@ -78,15 +89,6 @@ $curr_date = strftime("%Y %b %d %H:%M:%S",@curr_time);
 $short_date = strftime("%m/%d/%y",@curr_time);
 $| = 1;
 
-# map program invocation names to operation modes
-my %prognames = ( "uploaded-build"  => "set-uploaded",
-				  "failed-build"    => "set-failed",
-				  "no-build"		=> "set-not-for-us",
-				  "give-back-build" => "set-needs-build",
-				  "dep-wait-build"  => "set-dep-wait",
-				  "forget-build"	=> "forget",
-				  "build-info"		=> "info" );
-
 %short_category = ( u => "uploaded-fixed-pkg",
 				    f => "fix-expected",
 					r => "reminder-sent",
@@ -97,168 +99,115 @@ my %prognames = ( "uploaded-build"  => "set-uploaded",
 					c => "compiler-error",
 					"" => "none" );
 
-my $progname;
-($progname = $0) =~ s,.*/,,;
-if ($prognames{$progname}) {
-	$op_mode = $prognames{$progname};
-}
-elsif ($progname =~ /^list-(.*)$/) {
-	$op_mode = "list";
-	$list_state = ($1 eq "all") ? "" : $1;
-}
-
-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;
-                            die "$api too large" unless $api <= 1;
-                            } },
-	 verbose        => { short => "v", flag => \$verbose },
-	 override		=> { short => "o", flag => \$opt_override },
-	 "create-db"	=> { flag => \$opt_create_db },
-	 "correct-compare" => { flag => \$WannaBuild::opt_correct_version_cmp },
-	 # TODO: remove after buildds no longer pass to wanna-build
-	 "no-propagation" => { short => "N" },
-	 "no-down-propagation" => { short => "D" },
-	 # normal actions
-	 take			=> { mode => "set-building" },
-	 failed			=> { short => "f", mode => "set-failed" },
-	 uploaded		=> { short => "u", mode => "set-uploaded" },
-	 "no-build"		=> { short => "n", mode => "set-not-for-us" },
-	 built			=> { mode => "set-built" },
-	 attempted		=> { mode => "set-attempted" },
-	 "give-back"	        => { mode => "set-needs-build" },
-	 "dep-wait"		=> { mode => "set-dep-wait" },
-	 forget			=> { mode => "forget" },
-	 'forget-user' => { mode => 'forget-user' },
-	 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-v3"      => { mode => "merge-v3" },
-	 info			=> { short => "i", mode => "info" },
-	 'binNMU' => { mode => 'set-binary-nmu', arg => \$binNMUver, 
-			     code => sub { die "Invalid binNMU version: $binNMUver\n"
-				if $binNMUver !~ /^([\d]*)$/ and $1 >= 0; } },
-	 'perm-build-priority'    => { mode => "set-permanent-build-priority", arg => \$build_priority,
-	 		      code => sub { die "Invalid build priority: $build_priority\n"
-				if $build_priority !~ /^-?[\d]+$/; } },
-	 'build-priority'    => { mode => "set-build-priority", arg => \$build_priority,
-	 		      code => sub { die "Invalid build priority: $build_priority\n"
-				if $build_priority !~ /^-?[\d]+$/; } },
-	 list			=>
-	 { short => "l", mode => "list", arg => \$list_state,
-	   code => sub {
-		   die "Unknown state to list: $list_state\n"
-			   if !isin( $list_state, qw(needs-build building uploaded
-						 built build-attempted failed installed dep-wait
-						 not-for-us auto-not-for-us all failed-removed
-						 install-wait reupload-wait bd-uninstallable));} },
-	 # options with args
-	 dist           =>
-	 { short => "d", arg => \$distribution,
-	   code => sub {
-		   if ($distribution eq "a" || $distribution eq "all") {
-			   $info_all_dists = 1;
-			   $distribution = "";
-		   }
-		   else {
-			   $distribution = "oldstable"   if $distribution eq "o";
-			   $distribution = "stable"   if $distribution eq "s";
-			   $distribution = "testing"  if $distribution eq "t";
-			   $distribution = "unstable" if $distribution eq "u";
-		   }
-	   } },
-	 order          =>
-	 { short => "O", arg => \$list_order,
-	   code => sub {
-		   die "Bad ordering character\n"
-			   if $list_order !~ /^[PSpsncbCWT]+$/;
-	   } },
-	 message        => { short => "m", arg => \$fail_reason },
-	 # database is deprecated, use arch instead.
-	 database       => { short => "b", arg => \$conf::dbbase },
-	 arch           => { short => "A", arg => \$arch },
-	 user           => { short => "U", arg => \$user },
-	 category		=> { short => "c", arg => \$category,
-						 code => sub {
-							 $category = $short_category{$category}
-								 if exists $short_category{$category};
-							 die "Unknown category: $category\n"
-								 if !isin( $category, values %short_category );
-						 } },
-	 "min-age"      => { short => "a", arg => \$list_min_age,
-						 code => sub {
-							 die "Argument of --min-age must be a non-zero number\n"
-								 if $list_min_age == 0;
-						 } },
-	 "max-age"      => { arg => \$list_min_age,
-						 code => sub {
-							 die "Argument of --max-age must be a non-zero number\n"
-								 if $list_min_age == 0;
-							 $list_min_age *= -1;
-						 } },
-         "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] =~ /^-/ ) {
-	$_ = shift @ARGV;
-	last if $_ eq "--";
-	my($opt, $optname, $arg);
-	if (/^--([^=]+)(=|$)/) {
-		$optname = $1;
-		$opt = $options{$optname};
-		$arg = $1 if /^--\Q$optname\E=((.|\n)*)$/;
-	}
-	else {
-		$optname = substr( $_, 1, 1 );
-		$opt = (grep { defined($_->{short}) ? $_->{short} eq $optname : 0} values %options)[0];
-		$arg = $1 if /^-$optname(.+)$/;
-	}
-	if (!$opt) {
-		warn "Unknown option: --$1\n";
-		usage();
-	}
-	if ($opt->{arg}) {
-		if (!defined $arg) {
-			die "$optname option missing argument\n" if !@ARGV;
-			$arg = shift @ARGV;
-		}
-		${$opt->{arg}} = $arg;
-	}
-	elsif (defined $arg) {
-		die "Option $optname takes no argument\n";
-	}
-	
-	if ($opt->{mode}) {
-		die "Conflicting operation modes\n" if $op_mode;
-		$op_mode = $opt->{mode};
-	}
-	if ($opt->{flag}) {
-		${$opt->{flag}}++;
-	}
-	if ($opt->{code}) {
-		&{$opt->{code}};
-	}
-}
+# set mode of operation based on command line switch. Should be used
+# by GetOptions below.
+sub _set_mode_set { $op_mode = "set-$_[0]" }
+sub _set_mode { $op_mode = "$_[0]" }
+
+sub _option_deprecated { warn "Option $_[0] is deprecated" }
+
+GetOptions(
+    # this is not supported by all operations (yet)!
+    'simulate'      => \$simulate,
+    'simulate-edos' => \$simulate_edos,
+    'simulate-all'  => sub { $simulate = 1; $simulate_edos = 1; },
+    'api=i'         => sub {
+        $api = $_[1];
+        die "$api too large" unless $api <= 1;
+    },
+    '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
+    'no-propagation|N'      => \&_option_deprecated,
+    'no-down-propagation|D' => \&_option_deprecated,
+
+    # normal actions
+    'building|take'         => \&_set_mode_set,
+    'failed|f'              => \&_set_mode_set,
+    'uploaded|u'            => \&_set_mode_set,
+    'not-for-us|no-build|n' => \&_set_mode_set,
+    'built'                 => \&_set_mode_set,
+    'attempted'             => \&_set_mode_set,
+    'needs-build|give-back' => \&_set_mode_set,
+    'dep-wait'              => \&_set_mode_set,
+    'update'                => \&_set_mode_set,
+    'forget'                => \&_set_mode,
+    'forget-user'           => \&_set_mode,
+    'merge-v3'              => \&_set_mode,
+    'info|i'                => \&_set_mode,
+    'binary-nmu|binNMU=i'   => sub {
+        _set_mode_set(@_);
+        $binNMUver = $_[1];
+    },
+    'permanent-build-priority|perm-build-priority=i' => sub {
+        _set_mode_set(@_);
+        $build_priority = $_[1];
+    },
+    'build-priority=i' => sub {
+        _set_mode_set(@_);
+        $build_priority = $_[1];
+    },
+    'list|l=s' => sub {
+        _set_mode(@_);
+        $list_state = $_[1];
+        die "Unknown state to list: $list_state\n"
+          if not $list_state ~~ [
+              qw( needs-build building uploaded built
+                  build-attempted failed installed
+                  dep-wait not-for-us auto-not-for-us
+                  all failed-removed install-wait
+                  reupload-wait bd-uninstallable ) ];
+    },
+    'dist|d=s' => sub {
+        given ( $_[1] ) {
+            when ( [qw< a all >] ) {
+                $info_all_dists = 1;
+                $distribution   = '';
+            }
+            when ('o') { $distribution = 'oldstable'; }
+            when ('s') { $distribution = 'stable'; }
+            when ('t') { $distribution = 'testing'; }
+            when ('u') { $distribution = 'unstable'; }
+        }
+    },
+    'order|O=s' => sub {
+        $list_order = $_[1];
+        die "Bad ordering character\n"
+          if $list_order !~ /^[PSpsncbCWT]+$/;
+    },
+    'message|m=s'  => \$fail_reason,
+    'database|b=s' => sub {
+        warn "database is deprecated, please use 'arch' instead.\n";
+        $conf::dbbase = $_[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,
+    'own-format=s'      => \$ownprintformat,
+    'Pas=s'             => \$Pas,
+    'extra-depends=s'   => \$extra_depends,
+    'extra-conflicts=s' => \$extra_conflicts,
+
+    # special actions
+    'export' => sub { _set_mode(@_); $export_to   = $_[1]; },
+    'import' => sub { _set_mode(@_); $import_from = $_[1]; },
+    'manual-edit'                => \&_set_mode,
+    'distribution-architectures' => \&_set_mode,
+    'distribution-aliases'       => \&_set_mode,
+) or usage();
+$list_min_age = -1 * $list_max_age if $list_max_age;
 
 my $dbh;
 
@@ -269,18 +218,19 @@ END {
 	}
 }
 
+$distribution ||= "sid";
 if ($distribution eq 'any-priv') {
-    $privmode = 'yes';
+    $privmode = 1;
     $distribution = 'any';
 }
 if ($distribution eq 'any-unpriv') {
-    $privmode = 'no';
+    $privmode = 0;
     $distribution = 'any';
 }
 
 my $schema_suffix = '';
-$recorduser //= (not -t and $user =~ /^buildd_/);
-if (isin( $op_mode, qw(list info)) && $distribution !~ /security/ && !$recorduser && !($privmode eq 'yes')) {
+$recorduser //= (not -t and $user//"" =~ /^buildd_/);
+if ((isin( $op_mode, qw(list info)) && $distribution !~ /security/ && !$recorduser && !($privmode)) || $simulate) {
 	$dbh = DBI->connect("DBI:Pg:service=wanna-build") || 
 		die "FATAL: Cannot open database: $DBI::errstr\n";
 	$schema_suffix = '_public';
@@ -316,7 +266,6 @@ $distribution = $distribution_aliases{$distribution} if (isin($distribution, key
 
 $op_mode = $category ? "set-failed" : "set-building"
 	if !$op_mode; # default operation
-$distribution ||= "sid";
 undef $distribution if $distribution eq 'any';
 if ($distribution) {
     my @dists = split(/[, ]+/, $distribution);
@@ -392,7 +341,7 @@ my $yamlmap = ();
 my $yamldir = "/org/wanna-build/etc/yaml";
 my @files = ('wanna-build.yaml');
 if ((getpwuid($>))[7]) { push (@files, ((getpwuid($>))[7])."/.wanna-build.yaml"); }
-if ($user =~ /(buildd.*)-/) { push (@files, "$1.yaml") };
+if ($user && $user =~ /(buildd.*)-/) { push (@files, "$1.yaml") };
 if ($user) { push ( @files, "$user.yaml"); }
 foreach my $file (@files) {
         my $cfile = File::Spec->rel2abs( $file, $yamldir );
@@ -451,80 +400,6 @@ sub process {
 			forget_packages( @ARGV );
 			last SWITCH;
 		};
-		/^merge-partial-quinn/ && do {
-			die "This operation is restricted to admin users\n"
-				if (defined @conf::admin_users and
-				    !isin( $real_user, @conf::admin_users));
-			lock_table();
-			parse_quinn_diff(1);
-			last SWITCH;
-		};
-		/^merge-quinn/ && do {
-			die "This operation is restricted to admin users\n"
-				if (defined @conf::admin_users and
-				    !isin( $real_user, @conf::admin_users));
-			lock_table();
-			parse_quinn_diff(0);
-			last SWITCH;
-		};
-		/^merge-packages/ && do {
-			die "This operation is restricted to admin users\n"
-				if (defined @conf::admin_users and
-				    !isin( $real_user, @conf::admin_users));
-			lock_table();
-			parse_packages(0);
-			last SWITCH;
-		};
-		/^merge-sources/ && do {
-			die "This operation is restricted to admin users\n"
-				if (defined @conf::admin_users and
-				    !isin( $real_user, @conf::admin_users));
-			lock_table();
-			parse_sources(0);
-			last SWITCH;
-		};
-		/^pretend-avail/ && do {
-			pretend_avail( @ARGV );
-			last SWITCH;
-		};
-		/^merge-all$/ && do {
-			die "This operation is restricted to admin users\n"
-				if (defined @conf::admin_users and
-				    !isin( $real_user, @conf::admin_users));
-			lock_table();
-			my @ARGS = @ARGV;
-			@ARGV = ( $ARGS[0] );
-			my $pkgs = parse_packages(0);
-			@ARGV = ( $ARGS[1] );
-			parse_quinn_diff(0);
-			@ARGV = ( $ARGS[2] );
-			my $srcs = parse_sources(1);
-			call_edos_depcheck( {'arch' => $arch, 'pkgs' => ($ARGS[0]), 'srcs' => $srcs });
-			last SWITCH;
-		};
-		/^merge-all-secondary/ && do {
-			die "This operation is restricted to admin users\n"
-				if (defined @conf::admin_users and
-				    !isin( $real_user, @conf::admin_users));
-			# This is in case the chroot has multiple unrelated
-			# dist, for instance unstable and experimental.
-			# This is not for stable and proposed-updates.
-			# The second packages file contains a combination
-			# of all Packages files known to the buildd, the
-			# first only for the current dist.
-			lock_table();
-			my @ARGS = @ARGV;
-			@ARGV = ( $ARGS[0] );
-			my $pkgs = parse_packages(0);
-			@ARGV = ( $ARGS[3] );
-			my $pkgs = parse_packages(1);
-			@ARGV = ( $ARGS[1] );
-			parse_quinn_diff(0);
-			@ARGV = ( $ARGS[2] );
-			my $srcs = parse_sources(1);
-			call_edos_depcheck( {'arch' => $arch, 'pkgs' => ($ARGS[3]), 'srcs' => $srcs });
-			last SWITCH;
-		};
 		/^merge-v3/ && do {
                         die "This operation is restricted to admin users\n"
 			    if (defined @conf::admin_users and !isin( $real_user, @conf::admin_users) and !$simulate);
@@ -1347,485 +1222,6 @@ sub set_one_update {
 }
 
 
-sub parse_sources {
-	my %pkgs;
-	my %srcver;
-	my $name;
-	my $full = shift;
-
-	my $db = get_all_source_info();
-
-	local($/) = ""; # read in paragraph mode
-	while( <> ) {
-		my( $version, $arch, $section, $priority, $builddep, $buildconf, $binaries );
-		s/\s*$//m;
-		/^Package:\s*(\S+)$/mi and $name = $1;
-		/^Version:\s*(\S+)$/mi and $version = $1;
-		/^Architecture:\s*(\S+)$/mi and $arch = $1;
-		/^Section:\s*(\S+)$/mi and $section = $1;
-		/^Priority:\s*(\S+)$/mi and $priority = $1;
-		/^Build-Depends:\s*(.*)$/mi and $builddep = $1;
-		/^Build-Conflicts:\s*(.*)$/mi and $buildconf = $1;
-                /^Binary:\s*(.*)$/mi and $binaries = $1;
-
-		next if (defined $srcver{$name} and version_less( $version, $srcver{$name} ));
-		$srcver{$name} = $version;
-
-		$pkgs{$name}{'ver'} = $version;
-		$pkgs{$name}{'bin'} = $binaries;
-		$pkgs{$name}{'dep'} = $builddep;
-		$pkgs{$name}{'conf'} = $buildconf;
-		my $pkg = $db->{$name};
-
-		if (defined $pkg) {
-			my $change = 0;
-
-			if ($arch eq "all" && !version_less( $version, $pkg->{'version'} )) {
-				# package is now Arch: all, delete it from db
-				change_state( \$pkg, 'deleted' );
-				log_ta( $pkg, "--merge-sources" );
-				print "$name ($pkg->{'version'}): deleted ".
-					  "from database, because now Arch: all\n"
-						  if $verbose;
-				del_source_info($name);
-				delete $db->{$name};
-				next;
-			}
-
-			# The "Version" should always be the source version --
-			# not a possible binNMU version number.
-			$pkg->{'version'} = $version, $change++
-				if ($pkg->{'state'} eq 'Installed' and
-				!version_eq( $pkg->{'version'}, $version));
-			# Always update priority and section, if available
-			$pkg->{'priority'} = $priority, $change++
-				if defined $priority and (not defined($pkg->{'priority'}) or $pkg->{'priority'} ne $priority);
-
-			$pkg->{'section'} = $section, $change++
-				if defined $section and (not defined($pkg->{'section'}) or $pkg->{'section'} ne $section);
-
-			update_source_info($pkg) if $change;
-		}
-	}
-        # Now that we only have the latest source version, build the list
-        # of binary packages from the Sources point of view
-        foreach $name (keys %pkgs) {
-            foreach my $bin (split( /\s*,\s*/, $pkgs{$name}{'bin'} ) ) {
-                $merge_binsrc{$bin} = $name;
-            }
-        }
-	# remove installed packages that no longer have source available
-	# or binaries installed
-        foreach $name (keys %$db) {
-		next if $name =~ /^_/;
-		my $pkg = $db->{$name};
-		if (not defined($pkgs{$name})) {
-			change_state( \$pkg, 'deleted' );
-			log_ta( $pkg, "--merge-sources" );
-			print "$name ($pkg->{'version'}): ".
-				  "deleted from database, because ".
-				  "not in Sources anymore\n"
-					  if $verbose;
-			del_source_info($name);
-			delete $db->{$name};
-		} else {
-			next if !isin( $pkg->{'state'}, qw(Installed) );
-			if ($full && not defined $merge_srcvers{$name}) {
-                            change_state( \$pkg, 'deleted' );
-                            log_ta( $pkg, "--merge-sources" );
-                            print "$name ($pkg->{'version'}): ".
-                                      "deleted from database, because ".
-                                      "binaries don't exist anymore\n"
-                                              if $verbose;
-			    del_source_info($name);
-			    delete $db->{$name};
-                        } elsif ($full && version_less( $merge_srcvers{$name}, $pkg->{'version'})) {
-                            print "$name ($pkg->{'version'}): ".
-                                      "package is Installed but binaries are from ".
-                                      $merge_srcvers{$name}. "\n"
-                                              if $verbose;
-                        }
-                }
-	}
-	return \%pkgs;
-}
-
-# This function looks through a Packages file and sets the state of
-# packages to 'Installed'
-sub parse_packages {
-	my $depwait_only = shift;
-	my $installed;
-
-	my $pkgs = get_all_source_info();
-	local($/) = ""; # read in paragraph mode
-	while( <> ) {
-		my( $name, $version, $depends, $source, $sourcev, $architecture, $provides, $binaryv, $binnmu );
-		s/\s*$//m;
-		/^Package:\s*(\S+)$/mi and $name = $1;
-		/^Version:\s*(\S+)$/mi and $version = $1;
-		/^Depends:\s*(.*)$/mi and $depends = $1;
-		/^Source:\s*(\S+)(\s*\((\S+)\))?$/mi and ($source,$sourcev) = ($1, $3);
-		/^Architecture:\s*(\S+)$/mi and $architecture = $1;
-		/^Provides:\s*(.*)$/mi and $provides = $1;
-		next if !$name || !$version;
-		next if ($arch ne $architecture and $architecture ne "all");
-		next if (defined ($installed->{$name}) and $installed->{$name}{'version'} ne "" and
-			version_lesseq( $version, $installed->{$name}{'version'} ));
-		$installed->{$name}{'version'} = $version;
-		next if $depwait_only;
-		$installed->{$name}{'depends'} = $depends;
-		$installed->{$name}{'all'} = 1 if $architecture eq "all";
-		undef $installed->{$name}{'Provider'};
-		$installed->{$name}{'Source'} = $source ? $source : $name;
-		if ($provides) {
-                    foreach (split( /\s*,\s*/, $provides )) {
-                        if (not defined ($installed->{$_})) {
-                            $installed->{$_}{'version'} = "";
-                            $installed->{$_}{'Provider'} = $name;
-                        }
-                    }
-		}
-		if ( $version =~ /\+b(\d+)$/ ) {
-                    $binnmu = $1;
-		}
-		$version = $sourcev if $sourcev;
-		$binaryv = $version;
-		$binaryv =~ s/\+b\d+$//;
-		$installed->{$name}{'Sourcev'} = $sourcev ? $sourcev : $binaryv;
-		$binaryv .= "+b$binnmu" if defined($binnmu);
-
-		next if $architecture ne $arch;
-		$name = $source if $source;
-		next if defined($merge_srcvers{$name}) and $merge_srcvers{$name} eq $version;
-		$merge_srcvers{$name} = $version;
-
-		my $pkg = $pkgs->{$name};
-
-		if (defined $pkg) {
-			if (isin( $pkg->{'state'}, qw(Not-For-Us)) ||
-				(isin($pkg->{'state'}, qw(Installed)) &&
-				 version_lesseq($binaryv, $pkg->{'installed_version'}))) {
-				print "Skipping $name because State == $pkg->{'state'}\n"
-					if $verbose >= 2;
-				next;
-			}
-			if ($pkg->{'binary_nmu_version'} ) {
-				my $nmuver = binNMU_version($pkg->{'version'}, $pkg->{'binary_nmu_version'});
-				if (version_less( $binaryv, $nmuver )) {
-					print "Skipping $name ($version) because have newer ".
-						"version ($nmuver) in db.\n"
-							if $verbose >= 2;
-					next;
-				}
-			} elsif (version_less($version, $pkg->{'version'})) {
-				print "Skipping $name ($version) because have newer ".
-					"version ($pkg->{'version'}) in db.\n"
-						if $verbose >= 2;
-				next;
-			}
-
-			if (!pkg_version_eq($pkg, $version) &&
-			   $pkg->{'state'} ne "Installed") {
-				warn "Warning: $name: newer version than expected appeared ".
-					 "in archive ($version vs. $pkg->{'version'})\n";
-				delete $pkg->{'builder'};
-			}
-
-			if (!isin( $pkg->{'state'}, qw(Uploaded) )) {
-				warn "Warning: Package $name was not in uploaded state ".
-					 "before (but in '$pkg->{'state'}').\n";
-				delete $pkg->{'builder'};
-				delete $pkg->{'depends'};
-			}
-		} else {
-			$pkg = {};
-			$pkg->{'version'} = $version;
-		}
-		
-		change_state( \$pkg, 'Installed' );
-		$pkg->{'package'} = $name;
-		$pkg->{'installed_version'} = $binaryv;
-		if (defined $pkg->{'permbuildpri'}) {
-			$pkg->{'buildpri'} = $pkg->{'permbuildpri'};
-		} else {
-			delete $pkg->{'buildpri'};
-		}
-		$pkg->{'version'} = $version
-			if version_less( $pkg->{'version'}, $version);
-		delete $pkg->{'binary_nmu_version'};
-		delete $pkg->{'binary_nmu_changelog'};
-		log_ta( $pkg, "--merge-packages" );
-		update_source_info($pkg);
-		print "$name ($version) is up-to-date now.\n" if $verbose;
-	}
-
-	check_dep_wait( "--merge-packages", $installed );
-	return $installed;
-}
-
-sub pretend_avail {
-	my ($package, $name, $version, $installed);
-	
-	foreach $package (@_) {
-		$package =~ s,^.*/,,; # strip path
-		$package =~ s/\.(dsc|diff\.gz|tar\.gz|deb)$//; # strip extension
-		$package =~ s/_[\w\d]+\.changes$//; # strip extension
-		if ($package =~ /^([\w\d.+-]+)_([\w\d:.+~-]+)/) {
-			($name,$version) = ($1,$2);
-		}
-		else {
-			warn "$package: can't extract package name and version ".
-				 "(bad format)\n";
-			next;
-		}
-		$installed->{$name}{'version'} = $version;
-	}
-
-	check_dep_wait( "--pretend-avail", $installed );
-}
-
-sub check_dep_wait {
-	my $action = shift;
-	my $installed = shift;
-	
-	# check all packages in state Dep-Wait if dependencies are all
-	# available now
-	my $name;
-	my $db = get_all_source_info();
-        foreach $name (keys %$db) {
-		next if $name =~ /^_/;
-		my $pkg = $db->{$name};
-		next if $pkg->{'state'} ne "Dep-Wait";
-		my $deps = $pkg->{'depends'};
-		if (!$deps) {
-			print "$name: was in state Dep-Wait, but with empty ",
-				  "dependencies!\n";
-			goto make_needs_build;
-		}
-		my $deplist = parse_deplist($deps);
-		my $new_deplist;
-		my $allok = 1;
-		my @removed_deps;
-		foreach (keys %$deplist) {
-			if (!exists $installed->{$_} ||
-				($deplist->{$_}->{'rel'} && $deplist->{$_}->{'version'} &&
-				 !version_compare( $installed->{$_}{'version'},
-								   $deplist->{$_}->{'rel'},
-								   $deplist->{$_}->{'version'}))) {
-				$allok = 0;
-				$new_deplist->{$_} = $deplist->{$_};
-			}
-			else {
-				push( @removed_deps, $_ );
-			}
-		}
-		if ($allok) {
-		  make_needs_build:
-			change_state( \$pkg, 'Needs-Build' );
-			log_ta( $pkg, $action );
-			delete $pkg->{'builder'};
-			delete $pkg->{'depends'};
-			print "$name ($pkg->{'version'}) has all ",
-				  "dependencies available now\n" if $verbose;
-			$new_vers{$name}++;
-			update_source_info($pkg);
-		}
-		elsif (@removed_deps) {
-			$pkg->{'depends'} = build_deplist( $new_deplist );
-			print "$name ($pkg->{'version'}): some dependencies ",
-				  "(@removed_deps) available now, but not all yet\n"
-				if $verbose;
-			update_source_info($pkg);
-		}
-	}
-}
-
-# This function accepts quinn-diff output (either from a file named on
-# the command line, or on stdin) and sets the packages named there to
-# state 'Needs-Build'.
-sub parse_quinn_diff {
-	my $partial = shift;
-	my %quinn_pkgs;
-	my $dubious = "";
-	
-	my $pkgs = get_all_source_info();
-
-	while( <> ) {
-		my $change = 0;
-		next if !m,^([-\w\d/]*)/			# section
-			       ([-\w\d.+]+)_			# package name
-				   ([\w\d:.~+-]+)\.dsc\s*	# version
-				   \[([^:]*):				# priority
-				   ([^]]+)\]\s*$,x;			# rest of notes
-		my($section,$name,$version,$priority,$notes) = ($1, $2, $3, $4, $5);
-		$quinn_pkgs{$name}++;
-		$section ||= "unknown";
-		$priority ||= "unknown";
-		$priority = "unknown" if $priority eq "-";
-		$priority = "standard" if ($name eq "debian-installer");
-
-		my $pkg = $pkgs->{$name};
-
-		# Always update section and priority.
-		if (defined($pkg)) {
-
-			$pkg->{'section'}  = $section, $change++ if not defined
-				$pkg->{'section'} or $section ne "unknown";
-			$pkg->{'priority'} = $priority, $change++ if not defined
-				$pkg->{'priority'} or $priority ne "unknown";
-		}
-
-		if (defined($pkg) &&
-			$pkg->{'state'} =~ /^Dep-Wait/ &&
-			version_less( $pkg->{'version'}, $version )) {
-			change_state( \$pkg, 'Dep-Wait' );
-			$pkg->{'version'}  = $version;
-			delete $pkg->{'binary_nmu_version'};
-			delete $pkg->{'binary_nmu_changelog'};
-			log_ta( $pkg, "--merge-quinn" );
-			$change++;
-			print "$name ($version) still waiting for dependencies.\n"
-				if $verbose;
-		}
-		elsif (defined($pkg) &&
-			   $pkg->{'state'} =~ /-Removed$/ &&
-			   version_eq($pkg->{'version'}, $version)) {
-			# reinstantiate a package that has been removed earlier
-			# (probably due to a quinn-diff malfunction...)
-			my $newstate = $pkg->{'state'};
-			$newstate =~ s/-Removed$//;
-			change_state( \$pkg, $newstate );
-			$pkg->{'version'}  = $version;
-			$pkg->{'notes'}    = $notes;
-			log_ta( $pkg, "--merge-quinn" );
-			$change++;
-			print "$name ($version) reinstantiated to $newstate.\n"
-				if $verbose;
-		}
-		elsif (defined($pkg) &&
-			   $pkg->{'state'} eq "Not-For-Us" &&
-			   version_less( $pkg->{'version'}, $version )) {
-			# for Not-For-Us packages just update the version etc., but
-			# keep the state
-			change_state( \$pkg, "Not-For-Us" );
-			$pkg->{'package'}  = $name;
-			$pkg->{'version'}  = $version;
-			$pkg->{'notes'}    = $notes;
-			delete $pkg->{'builder'};
-			log_ta( $pkg, "--merge-quinn" );
-			$change++;
-			print "$name ($version) still Not-For-Us.\n" if $verbose;
-		}
-		elsif (!defined($pkg) ||
-			   $pkg->{'state'} ne "Not-For-Us" &&
-			   (version_less( $pkg->{'version'}, $version ) ||
-			   ($pkg->{'state'} eq "Installed" && version_less($pkg->{'installed_version'}, $version)))) {
-
-			if (defined( $pkg->{'state'} ) && isin( $pkg->{'state'}, qw(Building Built Build-Attempted))) {
-				send_mail( $pkg->{'builder'},
-						   "new version of $name (dist=$distribution)",
-						   "As far as I'm informed, you're currently ".
-						   "building the package $name\n".
-						   "in version $pkg->{'version'}.\n\n".
-						   "Now there's a new source version $version. ".
-						   "If you haven't finished\n".
-						   "compiling $name yet, you can stop it to ".
-						   "save some work.\n".
-						   "Just to inform you...\n".
-						   "(This is an automated message)\n" );
-				print "$name: new version ($version) while building ".
-					  "$pkg->{'version'} -- sending mail ".
-					  "to builder ($pkg->{'builder'})\n"
-				  if $verbose;
-			}
-			change_state( \$pkg, 'Needs-Build' );
-			$pkg->{'package'}  = $name;
-			$pkg->{'version'}  = $version;
-			$pkg->{'section'}  = $section;
-			$pkg->{'priority'} = $priority;
-			$pkg->{'notes'}    = $notes;
-			delete $pkg->{'builder'};
-			delete $pkg->{'binary_nmu_version'};
-			delete $pkg->{'binary_nmu_changelog'};
-			log_ta( $pkg, "--merge-quinn" );
-			$new_vers{$name}++;
-			$change++;
-			print "$name ($version) needs rebuilding now.\n" if $verbose;
-		}
-		elsif (defined($pkg) &&
-			   !version_eq( $pkg->{'version'}, $version ) &&
-			   isin( $pkg->{'state'}, qw(Installed Not-For-Us) )) {
-			print "$name: skipping because version in db ".
-				  "($pkg->{'version'}) is >> than ".
-				  "what quinn-diff says ($version) ".
-				  "(state is $pkg->{'state'})\n"
-					  if $verbose;
-			$dubious .= "$pkg->{'state'}: ".
-						"db ${name}_$pkg->{'version'} >> ".
-						"quinn $version\n" if !$partial;
-		}
-		elsif ($verbose >= 2) {
-			if ($pkg->{'state'} eq "Not-For-Us") {
-				print "Skipping $name because State == ".
-					  "$pkg->{'state'}\n";
-			}
-			elsif (!version_less($pkg->{'version'}, $version)) {
-				print "Skipping $name because version in db ".
-					  "($pkg->{'version'}) is >= than ".
-					  "what quinn-diff says ($version)\n";
-			}
-		}
-		update_source_info($pkg) if $change;
-	}
-
-	if ($dubious) {
-		send_mail( $conf::db_maint,
-				   "Dubious versions in " . table_name() . " "
-				   . $distribution . " table",
-				   "The following packages have a newer version in the ".
-				   "wanna-build database\n".
-				   "than what quinn-diff says, and this is strange for ".
-				   "their state\n".
-				   "It could be caused by a lame mirror, or the version ".
-				   "in the database\n".
-				   "is wrong.\n\n".
-				   $dubious );
-	}
-
-	# Now re-check the DB for packages in states Needs-Build, Failed,
-	# Dep-Wait or BD-Uninstallable and remove them if they're not listed
-	# anymore by quinn-diff.
-	if ( !$partial ) {
-		my $name;
-		my $db = get_all_source_info();
-		foreach $name (keys %$db) {
-			next if $name =~ /^_/;
-			my $pkg = $db->{$name};
-			next if defined $pkg->{'binary_nmu_version'};
-			next if !isin( $pkg->{'state'},
-						   qw(Needs-Build Building Built Build-Attempted Uploaded Failed Dep-Wait BD-Uninstallable) );
-			my $virtual_delete = $pkg->{'state'} eq 'Failed';
-								 
-			if (!$quinn_pkgs{$name}) {
-				change_state( \$pkg, $virtual_delete ?
-							  $pkg->{'state'}."-Removed" :
-							  'deleted' );
-				log_ta( $pkg, "--merge-quinn" );
-				print "$name ($pkg->{'version'}): ".
-					  ($virtual_delete ? "(virtually) " : "") . "deleted ".
-					  "from database, because not in quinn-diff anymore\n"
-						  if $verbose;
-				if ($virtual_delete) {
-				    update_source_info($pkg);
-				} else {
-				    del_source_info($name);
-				}
-			}
-		}
-	}
-}
-
-
 # for sorting priorities and sections
 BEGIN {
 	%prioval = ( required             => -5,
@@ -1911,21 +1307,21 @@ sub sort_list_func {
         'C' => ['<->', sub { return $_[0]->{'calprio'}; }],
         'W' => ['<->', sub { return $_[0]->{'state_days'}; }],
         'P' => ['<->', sub { return $_[0]->{'buildpri'}; }],
-        'p' => ['<=>', sub { return $prioval{$_[0]->{'priority'}}; }],
-        's' => ['<=>', sub { return $sectval{$_[0]->{'section'}}; }],
+        '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; }],
+        '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 $prioval{$_[0]->{'priority'}} > $prioval{'standard'}; }],
+        'S' => ['<->', sub { return isin($_[0]->{'priority'}, qw(required important standard)); }],
         'T' => ['<->', sub { return $_[0]->{'state_time'} % 86400;} ], # Fractions of a day
     };
 
 	foreach my $letter (split( //, $list_order )) {
             my $r;
-            $r = &{$map_funcs->{$letter}[1]}($b) <=> &{$map_funcs->{$letter}[1]}($a) if $map_funcs->{$letter}[0] eq '<->';
-            $r = &{$map_funcs->{$letter}[1]}($a) <=> &{$map_funcs->{$letter}[1]}($b) if $map_funcs->{$letter}[0] eq '<=>';
-            $r = &{$map_funcs->{$letter}[1]}($a) cmp &{$map_funcs->{$letter}[1]}($b) if $map_funcs->{$letter}[0] eq 'cmp';
+            $r = (&{$map_funcs->{$letter}[1]}($b)//0 ) <=> (&{$map_funcs->{$letter}[1]}($a)//0 ) if $map_funcs->{$letter}[0] eq '<->';
+            $r = (&{$map_funcs->{$letter}[1]}($a)//0 ) <=> (&{$map_funcs->{$letter}[1]}($b)//0 ) if $map_funcs->{$letter}[0] eq '<=>';
+            $r = (&{$map_funcs->{$letter}[1]}($a)//"") cmp (&{$map_funcs->{$letter}[1]}($b)//"") if $map_funcs->{$letter}[0] eq 'cmp';
             return $r if $r != 0;
 	}
 	return 0;
@@ -1948,8 +1344,8 @@ sub calculate_prio {
 	my $scale = $priomap->{'waitingdays'}->{'scale'} || 1;
 	$pkg->{'calprio'} += $days * $scale;
 
-        my $btime = max($pkg->{'anytime'}, $pkg->{'successtime'});
-        my $bhours = defined($btime) ? int($btime/3600) : ($priomap->{'buildhours'}->{'default'} || 2);
+        my $btime = max($pkg->{'anytime'}//0, $pkg->{'successtime'}//0);
+        my $bhours = $btime ? int($btime/3600) : ($priomap->{'buildhours'}->{'default'} || 2);
 	$bhours = $priomap->{'buildhours'}->{'min'} if $priomap->{'buildhours'}->{'min'} and $bhours < $priomap->{'buildhours'}->{'min'};
 	$bhours = $priomap->{'buildhours'}->{'max'} if $priomap->{'buildhours'}->{'max'} and $bhours > $priomap->{'buildhours'}->{'max'};
 	$scale = $priomap->{'buildhours'}->{'scale'} || 1;
@@ -2007,7 +1403,9 @@ sub print_format {
     my $printfmt = shift;
     my $pkg = shift;
     my $var = shift;
+
 =pod
+
 Within an format string, the following values are allowed (need to be preceded by %).
 This can be combined to e.g.
 wanna-build --format='wanna-build -A %a --give-back %p_%v' -A mipsel --list=failed
@@ -2041,6 +1439,7 @@ X the string normally between [], e.g. optional:out-of-date:calprio{61}:days{25}
 Text could contain further %. To start with !, use %!
 
 =cut
+
     return stringf($printfmt, (
         'p' => make_fmt( $pkg->{'package'}, $pkg, $var),
         'a' => make_fmt( $arch, $pkg, $var),
@@ -2050,8 +1449,9 @@ Text could contain further %. To start with !, use %!
         'S' => make_fmt( $pkg->{'state'}, $pkg, $var),
         'u' => make_fmt( $pkg->{'builder'}, $pkg, $var),
         'X' => make_fmt( sub {
+            no warnings;
             my $c = "$pkg->{'priority'}:$pkg->{'notes'}";
-            $c .= ":PREV-FAILED" if $pkg->{'previous_state'} =~ /^Failed/;
+            $c .= ":PREV-FAILED" if $pkg->{'previous_state'} && $pkg->{'previous_state'} =~ /^Failed/;
             $c .= ":bp{" . $pkg->{'buildpri'} . "}" if defined $pkg->{'buildpri'};
             $c .= ":binNMU{" . $pkg->{'binary_nmu_version'} . "}" if defined $pkg->{'binary_nmu_version'};
             $c .= ":calprio{". $pkg->{'calprio'}."}";
@@ -2079,8 +1479,8 @@ Text could contain further %. To start with !, use %!
         'O' => make_fmt( sub { return seconds2time ( $pkg->{'successtime'}); }, $pkg, $var),
         'q' => make_fmt( $pkg->{'anytime'}, $pkg, $var),
         'Q' => make_fmt( sub { return seconds2time ( $pkg->{'anytime'}); }, $pkg, $var),
-        'r' => make_fmt( sub { return max($pkg->{'successtime'}, $pkg->{'anytime'}); }, $pkg, $var),
-        'R' => make_fmt( sub { return seconds2time ( max($pkg->{'successtime'}, $pkg->{'anytime'})); }, $pkg, $var),
+        'r' => make_fmt( sub { my $c = max($pkg->{'successtime'}//0, $pkg->{'anytime'}//0); return $c if $c; return; }, $pkg, $var),
+        'R' => make_fmt( sub { return seconds2time ( max($pkg->{'successtime'}//0, $pkg->{'anytime'}//0)); }, $pkg, $var),
     ));
 }
 
@@ -2103,10 +1503,10 @@ sub list_packages {
         @list = grep { !$_->{'extra_depends'} and !$_->{'extra_conflicts'} } @list if $api < 1 ;
 
         # first adjust ownprintformat, then set printformat accordingly
-        $printformat ||= $yamlmap->{"format"}{$ownprintformat};
+        $printformat ||= $yamlmap->{"format"}{$ownprintformat} if $ownprintformat;
         $printformat ||= $yamlmap->{"format"}{"default"}{$state};
         $printformat ||= $yamlmap->{"format"}{"default"}{"default"};
-        undef $printformat if ($ownprintformat eq 'none');
+        undef $printformat if ($ownprintformat && $ownprintformat eq 'none');
 
 	foreach $pkg (sort sort_list_func @list) {
                 if ($printformat) {
@@ -2256,11 +1656,11 @@ sub read_db {
 	my $file = shift;
 
 	print "Reading ASCII database from $file..." if $verbose >= 1;
-	open( F, "<$file" ) or
+	open( my $fh, '<', $file ) or
 		die "Can't open database $file: $!\n";
 
 	local($/) = ""; # read in paragraph mode
-	while( <F> ) {
+	while( <$fh> ) {
 		my( %thispkg, $name );
 		s/[\s\n]+$//;
 		s/\n[ \t]+/\376\377/g;  # fix continuation lines
@@ -2288,7 +1688,7 @@ sub read_db {
 				or die $dbh->errstr;
 		 }
 	}
-	close( F );
+	close( $fh );
 	print "done\n" if $verbose >= 1;
 }
 
@@ -2328,7 +1728,7 @@ sub export_db {
 	my($name,$pkg,$key);
 
 	print "Writing ASCII database to $file..." if $verbose >= 1;
-	open( F, ">$file" ) or
+	open( my $fh, '>', $file ) or
 		die "Can't open export $file: $!\n";
 
         my $db = get_all_source_info();
@@ -2341,11 +1741,11 @@ sub export_db {
 			$val =~ s/\n*$//;
 			$val =~ s/^/ /mg;
 			$val =~ s/^ +$/ ./mg;
-			print F "$key: $val\n";
+			print $fh "$key: $val\n";
 		}
-		print F "\n";
+		print $fh "\n";
        }
-       close( F );
+       close( $fh );
        print "done\n" if $verbose >= 1;
 }
 
@@ -2363,8 +1763,8 @@ sub change_state {
 	if (defined($$state) and $$state eq 'Failed') {
 		$pkg->{'old_failed'} =
 			"-"x20 . " $pkg->{'version'} " . "-"x20 . "\n" .
-			$pkg->{'failed'} . "\n" .
-			$pkg->{'old_failed'};
+			($pkg->{'failed'} // ""). "\n" .
+			($pkg->{'old_failed'} // "");
 		delete $pkg->{'failed'};
 		delete $pkg->{'failed_category'};
 	}
@@ -2422,13 +1822,13 @@ sub send_mail {
 	$to .= '@' . $domain if $to !~ /\@/;
 	$text =~ s/^\.$/../mg;
 	local $SIG{'PIPE'} = 'IGNORE';
-	open( PIPE,  "| $conf::mailprog -oem $to" )
+	open( my $pipe,  '|-', "$conf::mailprog -oem $to" )
 		or die "Can't open pipe to $conf::mailprog: $!\n";
 	chomp $text;
-	print PIPE "From: $from\n";
-	print PIPE "Subject: $subject\n\n";
-	print PIPE "$text\n";
-	close( PIPE );
+	print $pipe "From: $from\n";
+	print $pipe "Subject: $subject\n\n";
+	print $pipe "$text\n";
+	close( $pipe );
 }
 
 # for parsing input to dep-wait
@@ -2502,8 +1902,8 @@ sub wb_edos_builddebcheck {
 
     my $packagearch="";
     foreach my $packagefile (@$packagefiles) {
-        open(P,$packagefile);
-        while (<P>) {
+        open(my $fh,'<', $packagefile);
+        while (<$fh>) {
             next unless /^Architecture/;
             next if /^Architecture:\s*all/;
             /Architecture:\s*([^\s]*)/;
@@ -2513,7 +1913,7 @@ sub wb_edos_builddebcheck {
     	        return "Package file contains different architectures: $packagearch, $1";
             }
         }
-        close P;
+        close $fh;
     }
 
     if ( $architecture eq "" ) {
@@ -2531,14 +1931,14 @@ sub wb_edos_builddebcheck {
     }
 
     print "calling: edos-debcheck $edosoptions < $sourcesfile ".join('', map {" '-base FILE' ".$_ } @$packagefiles)."\n";
-    open(RESULT, '-|',
+    open(my $result_cmd, '-|',
         "edos-debcheck $edosoptions < $sourcesfile ".join('', map {" '-base FILE' ".$_ } @$packagefiles));
 
     my $explanation="";
     my $result={};
     my $binpkg="";
 
-    while (<RESULT>) {
+    while (<$result_cmd>) {
 # source---pulseaudio (= 0.9.15-4.1~bpo50+1): FAILED
 #   source---pulseaudio (= 0.9.15-4.1~bpo50+1) depends on missing:
 #   - libltdl-dev (>= 2.2.6a-2)
@@ -2567,7 +1967,7 @@ sub wb_edos_builddebcheck {
         }
     }
 
-    close RESULT;
+    close $result_cmd;
     $result->{$binpkg} = $explanation if $binpkg;
     return $result;
 
@@ -2669,7 +2069,7 @@ sub call_edos_depcheck {
 	my $change = 
 	    (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'};
+	my $problemchange = ($interesting_packages{$key}//"") ne ($pkg->{'bd_problem'}//"");
 	if ($change) {
 	    if (defined $interesting_packages{$key}) {
 		    change_state( \$pkg, 'BD-Uninstallable' );
@@ -2737,10 +2137,6 @@ Options:
 	 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
-        free packages waiting for them
     -i SRC_PKG, --info SRC_PKG: Show information for source package
     -l STATE, --list=STATE: List all packages in state STATE; can be
         combined with -U to restrict to a specific user; STATE can
@@ -2858,12 +2254,12 @@ sub get_all_source_info {
 		push @args, "FAILED";
 	}
 
-	if ($options{list_min_age} > 0) {
+	if ($options{list_min_age} && $options{list_min_age} > 0) {
 		$q .= ' AND age(state_change) > ? ';
 		push @args, $options{list_min_age} . " days";
 	}
 
-	if ($options{list_min_age} < 0) {
+	if ($options{list_min_age} && $options{list_min_age} < 0) {
 		$q .= ' AND age(state_change) < ? ';
 		push @args, -$options{list_min_age} . " days";
 	}
@@ -2996,14 +2392,13 @@ sub add_user_info {
 		or die $dbh->errstr;
 }
 
-sub lock_table()
-{
+sub lock_table {
         return if $simulate;
 	$dbh->do('LOCK TABLE ' . table_name() .
 		' IN EXCLUSIVE MODE', undef) or die $dbh->errstr;
 }
 
-sub parse_argv() {
+sub parse_argv {
 # parts the array $_[0] and $_[1] and returns the sub-array (modifies the original one)
     my @ret = ();
     my $args = shift;
@@ -3015,7 +2410,7 @@ sub parse_argv() {
     return @ret;
 }
 
-sub parse_all_v3() {
+sub parse_all_v3 {
     my $srcs = shift;
     my $vars = shift;
     my $db = get_all_source_info();
@@ -3031,7 +2426,7 @@ 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'}):";
+            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
             for my $bin (@{$pkgs->{'binary'}}) {
@@ -3042,27 +2437,33 @@ sub parse_all_v3() {
             }
             $pkg->{'package'}  = $name;
         }
-        my $logstr = "merge-v3 $vars->{'time'} ".$name."_$pkgs->{'version'}".
+        my $logstr = sprintf("merge-v3 %s %s_%s", $vars->{'time'}, $name, $pkgs->{'version'}).
             ($pkgs->{'binnmu'} ? ";b".$pkgs->{'binnmu'} : "").
-            "($vars->{'arch'}, $vars->{'suite'}, previous: $pkg->{'version'}".
+            sprintf(" (%s, %s, previous: %s", $vars->{'arch'}, $vars->{'suite'}, $pkg->{'version'}//"").
             ($pkg->{'binary_nmu_version'} ? ";b".$pkg->{'binary_nmu_version'} : "").
             ", $pkg->{'state'}):";
 
-        if (isin($pkgs->{'status'}, qw (installed related)) && $pkgs->{'version'} eq $pkg->{'version'} && $pkg->{'binary_nmu_version'} && $pkgs->{'binnmu'} < int($pkg->{'binary_nmu_version'})) {
+        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))) {
+        if (isin($pkgs->{'status'}, qw (installed related auto-not-for-us))) {
             my $change = 0;
-            if ($pkg->{'state'} ne 'Installed') {
-                change_state( \$pkg, 'Installed');
-                delete $pkg->{'depends'};
-                delete $pkg->{'extra_depends'};
-                delete $pkg->{'extra_conflicts'};
+            my $tstate = {'installed' => 'Installed', 'related' => 'Installed', 'auto-not-for-us' => '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_state( \$pkg, $tstate);
+                if (isin( $tstate, qw<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' };
             foreach my $k (keys %$attrs) {
-                if ($pkg->{$k} ne $pkgs->{$attrs->{$k}}) {
+                next if isin( $tstate, qw<Auto-Not-For-Us>) && isin( $k, qw<installed_version binary_nmu_version>);
+                if (($pkg->{$k}//"") ne ($pkgs->{$attrs->{$k}}//"")) {
                     $pkg->{$k} = $pkgs->{$attrs->{$k}};
                     $change++;
                 }
@@ -3072,8 +2473,8 @@ sub parse_all_v3() {
                 $change++;
             }
             if ($change) {
-                print "$logstr set to installed/".$pkg->{'notes'}."\n" if $verbose || $simulate;
-                log_ta( $pkg, "--merge-v3: installed" ) unless $simulate;
+                print "$logstr set to $tstate/".($pkg->{'notes'}//"")."\n" if $verbose || $simulate;
+                log_ta( $pkg, "--merge-v3: $tstate" ) unless $simulate;
                 update_source_info($pkg) unless $simulate;
             }
             next;
@@ -3094,23 +2495,12 @@ sub parse_all_v3() {
             next;
         }
 
-        if ($pkgs->{'status'} eq 'auto-not-for-us') {
-            next if isin( $pkg->{'state'}, qw(Not-For-Us Failed Failed-Removed Dep-Wait Dep-Wait-Removed));
-            # if the package is currently current, the status is Installed, not not-for-us
-
-            change_state( \$pkg, "Auto-Not-For-Us" );
-	    log_ta( $pkg, "--merge-v3: Auto-Not-For-Us" ) unless $simulate;
-	    update_source_info($pkg) unless $simulate;
-            print "$logstr set to auto-not-for-us\n" if $verbose || $simulate;
-            next SRCS;
-        }
-
         # 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";
             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 $pkgs->{'binnmu'}//0 >= int($pkg->{'binary_nmu_version'}//0);
         next if $pkgs->{'version'} eq $pkg->{'version'} and !isin( $pkg->{'state'}, qw(Installed));
         next if isin( $pkg->{'state'}, qw(Not-For-Us Failed-Removed));