summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorespie <espie@openbsd.org>2009-12-29 15:21:02 +0000
committerespie <espie@openbsd.org>2009-12-29 15:21:02 +0000
commit1ca9983bdcdc31b8c0800d14f5edb9e77720ab3d (patch)
treea6ef41700ff677364d02bb704535d12568283afb
parentImplement MP safe mutexes for hppa. (diff)
downloadwireguard-openbsd-1ca9983bdcdc31b8c0800d14f5edb9e77720ab3d.tar.xz
wireguard-openbsd-1ca9983bdcdc31b8c0800d14f5edb9e77720ab3d.zip
the way Tracker works, installed packages are always marked uptodate as well,
so remove some unneeded checks from solver's perspective.
-rw-r--r--usr.sbin/pkg_add/OpenBSD/Dependencies.pm15
1 files changed, 2 insertions, 13 deletions
diff --git a/usr.sbin/pkg_add/OpenBSD/Dependencies.pm b/usr.sbin/pkg_add/OpenBSD/Dependencies.pm
index 06afd86d936..57e1faff2d3 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.108 2009/12/29 14:36:53 espie Exp $
+# $OpenBSD: Dependencies.pm,v 1.109 2009/12/29 15:21:02 espie Exp $
#
# Copyright (c) 2005-2007 Marc Espie <espie@openbsd.org>
#
@@ -217,11 +217,6 @@ our @ISA=(qw(_cache));
sub do
{
my ($v, $solver, $state, $dep, $package) = @_;
- if ($state->tracker->{installed}{$$v}) {
- bless $v, "_cache::installed";
- set_global($dep, $v);
- return $$v;
- }
if ($state->tracker->{uptodate}{$$v}) {
bless $v, "_cache::installed";
set_global($dep, $v);
@@ -400,13 +395,7 @@ sub find_dep_in_stuff_to_install
{
my ($self, $state, $dep) = @_;
- my $v = find_candidate($dep->spec, keys %{$state->tracker->{installed}});
- if ($v) {
- set_global($dep, _cache::installed->new($v));
- return $v;
- }
-
- $v = find_candidate($dep->spec, keys %{$state->tracker->{uptodate}});
+ my $v = find_candidate($dep->spec, keys %{$state->tracker->{uptodate}});
if ($v) {
set_global($dep, _cache::installed->new($v));
return $v;