diff options
| author | Marc Espie <espie@cvs.openbsd.org> | 2009-11-08 11:18:42 +0000 |
|---|---|---|
| committer | Marc Espie <espie@cvs.openbsd.org> | 2009-11-08 11:18:42 +0000 |
| commit | 64fb7208ebfacb8c8dfee6cb22778c3fc601e53f (patch) | |
| tree | 0e61f66f8aa97224aa40ff8503ed90979f67ebc5 /usr.sbin/pkg_add/OpenBSD | |
| parent | 9a8b30600bf602bc541cacc6b1116f32ec60039c (diff) | |
tracker/updater methods for state that auto-create the object.
Diffstat (limited to 'usr.sbin/pkg_add/OpenBSD')
| -rw-r--r-- | usr.sbin/pkg_add/OpenBSD/Dependencies.pm | 12 | ||||
| -rw-r--r-- | usr.sbin/pkg_add/OpenBSD/Handle.pm | 4 |
2 files changed, 8 insertions, 8 deletions
diff --git a/usr.sbin/pkg_add/OpenBSD/Dependencies.pm b/usr.sbin/pkg_add/OpenBSD/Dependencies.pm index 3e3e8b58904..735eb957e86 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.78 2009/10/19 14:20:55 espie Exp $ +# $OpenBSD: Dependencies.pm,v 1.79 2009/11/08 11:18:41 espie Exp $ # # Copyright (c) 2005-2007 Marc Espie <espie@openbsd.org> # @@ -256,7 +256,7 @@ sub find_dep_in_stuff_to_install { my ($self, $state, $dep) = @_; - return find_candidate($dep->spec, keys %{$state->{tracker}->{to_install}}); + return find_candidate($dep->spec, keys %{$state->tracker->{to_install}}); } sub solve_dependency @@ -273,7 +273,7 @@ sub solve_dependency } $v = $self->find_dep_in_stuff_to_install($state, $dep); if ($v) { - push(@{$self->{deplist}}, $state->{tracker}->{to_install}->{$v}); + push(@{$self->{deplist}}, $state->tracker->{to_install}->{$v}); return $v; } } @@ -289,7 +289,7 @@ sub solve_dependency if (!$state->{allow_replacing}) { $v = $self->find_dep_in_stuff_to_install($state, $dep); if ($v) { - push(@{$self->{deplist}}, $state->{tracker}->{to_install}->{$v}); + push(@{$self->{deplist}}, $state->tracker->{to_install}->{$v}); return $v; } } @@ -298,7 +298,7 @@ sub solve_dependency if ($v) { my $s = OpenBSD::UpdateSet->from_location($v); - $state->{tracker}->add_set($s); + $state->tracker->add_set($s); push(@{$self->{deplist}}, $s); return $v->{name}; @@ -307,7 +307,7 @@ sub solve_dependency # resort to default if nothing else $v = $dep->{def}; my $s = OpenBSD::UpdateSet->create_new($v); - $state->{tracker}->add_set($s); + $state->tracker->add_set($s); push(@{$self->{deplist}}, $s); return $v; } diff --git a/usr.sbin/pkg_add/OpenBSD/Handle.pm b/usr.sbin/pkg_add/OpenBSD/Handle.pm index 14f8e480c6c..54d4ea59fd0 100644 --- a/usr.sbin/pkg_add/OpenBSD/Handle.pm +++ b/usr.sbin/pkg_add/OpenBSD/Handle.pm @@ -1,5 +1,5 @@ # ex:ts=8 sw=4: -# $OpenBSD: Handle.pm,v 1.6 2009/10/19 14:00:10 espie Exp $ +# $OpenBSD: Handle.pm,v 1.7 2009/11/08 11:18:41 espie Exp $ # # Copyright (c) 2007-2009 Marc Espie <espie@openbsd.org> # @@ -177,7 +177,7 @@ sub get_plist OpenBSD::Add::tweak_package_status($pkgname, $state); print "Not reinstalling $pkgname\n" if $state->{verbose} and !$handle->{tweaked}; - $state->{tracker}->{installed}->{$pkgname} = 1; + $state->tracker->{installed}->{$pkgname} = 1; $location->close_now; $location->wipe_info; $handle->set_error(ALREADY_INSTALLED); |