From: espie <espie@openbsd.org>
Date: Sat, 7 Aug 2010 10:26:58 +0000 (+0000)
Subject: need to check that kept packages are still okay.
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=d278da568eed2d2e099711b06abeae03b773ba35;p=openbsd

need to check that kept packages are still okay.
fixes:

sudo pkg_add -r ghostscript-8.63p13-no_x11.tgz
quirks-1.17: 1/1
ghostscript-8.63p13->ghostscript-8.63p13-no_x11 forward dependencies:
| Dependency of libspectre-0.2.6 on ghostscript-*-!no_x11 doesn't match
Merging libspectre-0.2.6->libspectre-0.2.6 (1/3)
[libspectre-0.2.6]ghostscript-8.63p13->ghostscript-8.63p13-no_x11: 3/3
Read shared items: ok
---

diff --git a/usr.sbin/pkg_add/OpenBSD/Dependencies.pm b/usr.sbin/pkg_add/OpenBSD/Dependencies.pm
index d73c83f9a71..b6976465f5a 100644
--- a/usr.sbin/pkg_add/OpenBSD/Dependencies.pm
+++ b/usr.sbin/pkg_add/OpenBSD/Dependencies.pm
@@ -1,5 +1,5 @@
 # ex:ts=8 sw=4:
-# $OpenBSD: Dependencies.pm,v 1.132 2010/06/30 10:51:04 espie Exp $
+# $OpenBSD: Dependencies.pm,v 1.133 2010/08/07 10:26:58 espie Exp $
 #
 # Copyright (c) 2005-2010 Marc Espie <espie@openbsd.org>
 #
@@ -587,7 +587,7 @@ sub solve_depends
 	$self->{deplist} = {};
 	delete $self->{installed};
 
-	for my $package ($self->{set}->newer) {
+	for my $package ($self->{set}->newer, $self->{set}->kept) {
 		$package->{before} = [];
 		for my $dep (@{$package->{plist}->{depend}}) {
 			my $v = $self->solve_dependency($state, $dep, $package);