diff options
| author | Marc Espie <espie@cvs.openbsd.org> | 2007-06-02 11:18:47 +0000 |
|---|---|---|
| committer | Marc Espie <espie@cvs.openbsd.org> | 2007-06-02 11:18:47 +0000 |
| commit | 9beaacc450d2bd2d8bd90dca6c7c4a27a6df99ed (patch) | |
| tree | 514ec8fcb4386891a9423c5a467512295a87c61b | |
| parent | edc495da5a88f5c8ec7f25327d80bcd8352b65bb (diff) | |
move the solver object up to the set level.
| -rw-r--r-- | usr.sbin/pkg_add/OpenBSD/Dependencies.pm | 8 | ||||
| -rw-r--r-- | usr.sbin/pkg_add/pkg_add | 18 |
2 files changed, 13 insertions, 13 deletions
diff --git a/usr.sbin/pkg_add/OpenBSD/Dependencies.pm b/usr.sbin/pkg_add/OpenBSD/Dependencies.pm index bf563df6be8..278b9ed43c7 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.44 2007/06/01 22:35:46 espie Exp $ +# $OpenBSD: Dependencies.pm,v 1.45 2007/06/02 11:18:46 espie Exp $ # # Copyright (c) 2005-2007 Marc Espie <espie@openbsd.org> # @@ -35,9 +35,9 @@ sub find_candidate sub new { - my ($class, $plist) = @_; - bless {plist => $plist, to_install => {}, deplist => [], - to_register => {} }, $class; + my ($class, $set) = @_; + bless {set => $set, plist => $set->handle->{plist}, + to_install => {}, deplist => [], to_register => {} }, $class; } sub dependencies diff --git a/usr.sbin/pkg_add/pkg_add b/usr.sbin/pkg_add/pkg_add index 066ce6de616..0d65a3564b0 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.304 2007/06/02 10:29:44 espie Exp $ +# $OpenBSD: pkg_add,v 1.305 2007/06/02 11:18:46 espie Exp $ # # Copyright (c) 2003-2007 Marc Espie <espie@openbsd.org> # @@ -473,7 +473,7 @@ sub really_add OpenBSD::SharedLibs::add_libs_from_plist($plist); $plist->to_cache; OpenBSD::Add::register_installation($plist); - $handle->{solver}->register_dependencies; + $set->{solver}->register_dependencies; add_installed($pkgname); delete $handle->{partial}; OpenBSD::PkgCfl::register($plist, $state); @@ -521,10 +521,10 @@ sub install_package return () unless $forced{arch}; } } - if (!defined $handle->{solver}) { - my $solver = OpenBSD::Dependencies::Solver->new($handle->{plist}); + if (!defined $set->{solver}) { + my $solver = OpenBSD::Dependencies::Solver->new($set); my @deps = $solver->solve($state, @todo); - $handle->{solver} = $solver; + $set->{solver} = $solver; if ($state->{verbose}) { $solver->dump; } @@ -536,7 +536,7 @@ sub install_package # verify dependencies and register them - for my $dep ($handle->{solver}->dependencies) { + for my $dep ($set->{solver}->dependencies) { next if is_installed($dep); print "Can't install $pkg: can't resolve $dep\n"; $location->close_now; @@ -546,13 +546,13 @@ sub install_package my $okay = 1; for my $lib (@{$plist->{wantlib}}) { - if (!$handle->{solver}->lookup_library($state, $lib->{name})) { + if (!$set->{solver}->lookup_library($state, $lib->{name})) { Warn "Can't install $pkg: lib not found ", $lib->{name}, "\n"; - $handle->{solver}->dump if $okay; + $set->{solver}->dump if $okay; $okay = 0; } } -# print "Didn't need to process: ", join(',', @{$handle->{solver}->{todo}}), "\n"; +# print "Didn't need to process: ", join(',', @{$set->{solver}->{todo}}), "\n"; if (!$okay) { $location->close_now; if (!$forced{libdepends}) { |