diff options
Diffstat (limited to 'usr.sbin/pkg_add/pkg_add')
| -rw-r--r-- | usr.sbin/pkg_add/pkg_add | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/usr.sbin/pkg_add/pkg_add b/usr.sbin/pkg_add/pkg_add index 791a1fd6483..0d1d2370bc7 100644 --- a/usr.sbin/pkg_add/pkg_add +++ b/usr.sbin/pkg_add/pkg_add @@ -1,7 +1,7 @@ #! /usr/bin/perl # ex:ts=8 sw=4: -# $OpenBSD: pkg_add,v 1.251 2007/05/17 15:35:58 espie Exp $ +# $OpenBSD: pkg_add,v 1.252 2007/05/17 15:40:06 espie Exp $ # # Copyright (c) 2003-2007 Marc Espie <espie@openbsd.org> # @@ -533,7 +533,6 @@ sub install_package my $solver = OpenBSD::Dependencies::Solver->new($handle->{plist}); my @deps = $solver->solve($state, @todo); $handle->{solver} = $solver; - $handle->{solved_dependencies} = $solver->{to_register}; if ($state->{verbose}) { $solver->dump; } @@ -560,8 +559,7 @@ sub install_package my $okay = 1; for my $lib (@{$plist->{wantlib}}) { my $extra = {}; - if (!OpenBSD::Dependencies::Solver::lookup_library($state, $lib->{name}, $plist, - $handle->{solved_dependencies}, $extra)) { + if (!$handle->{solver}->lookup_library($state, $lib->{name}, $extra)) { Warn "Can't install $pkg: lib not found ", $lib->{name}, "\n"; clue($extra) if $okay; $okay = 0; |