now that things are clean enough, we just need to figure out kept packages

before we solve depends. Avoids keeping full packing-lists all along the
dependency chain...

1 files changed, 10 insertions, 10 deletions

diff --git a/usr.sbin/pkg_add/OpenBSD/PkgAdd.pm b/usr.sbin/pkg_add/OpenBSD/PkgAdd.pm
index f6da3f94173..8913eaf7b54 100644
--- a/usr.sbin/pkg_add/OpenBSD/PkgAdd.pm
+++ b/usr.sbin/pkg_add/OpenBSD/PkgAdd.pm
@@ -1,7 +1,7 @@
 #! /usr/bin/perl
 
 # ex:ts=8 sw=4:
-# $OpenBSD: PkgAdd.pm,v 1.53 2014/02/02 09:11:27 espie Exp $
+# $OpenBSD: PkgAdd.pm,v 1.54 2014/02/02 11:19:31 espie Exp $
 #
 # Copyright (c) 2003-2014 Marc Espie <espie@openbsd.org>
 #
@@ -332,8 +332,6 @@ sub complete
 {
 	my ($set, $state) = @_;
 
-	$set->figure_out_kept($state);
-
 	for my $n ($set->newer) {
 		$n->complete($state);
 		my $plist = $n->plist;
@@ -885,13 +883,7 @@ sub process_set
 		}
 	}
 
-	if (!$set->complete($state)) {
-		return $set;
-	}
-
-	if (newer_has_errors($set, $state)) {
-		return ();
-	}
+	$set->figure_out_kept($state);
 
 	my @deps = $set->solver->solve_depends($state);
 	if ($state->verbose >= 2) {
@@ -903,6 +895,14 @@ sub process_set
 		return (@deps, $set);
 	}
 
+	if (!$set->complete($state)) {
+		return $set;
+	}
+
+	if (newer_has_errors($set, $state)) {
+		return ();
+	}
+
 	if ($set->older_to_do) {
 		my $r = $set->check_forward_dependencies($state);
 		if (!defined $r) {