summaryrefslogtreecommitdiff
path: root/usr.sbin/pkg_add/OpenBSD/Dependencies.pm
diff options
context:
space:
mode:
authorMarc Espie <espie@cvs.openbsd.org>2010-12-24 09:04:15 +0000
committerMarc Espie <espie@cvs.openbsd.org>2010-12-24 09:04:15 +0000
commitfad9aa48fa7616bef3da618e4d69e10390f368af (patch)
tree88efd00c61e7bb289cb682ca2ae56ea1399d76c9 /usr.sbin/pkg_add/OpenBSD/Dependencies.pm
parente8aa660d2596713d58d74612b0c701258b61f0b2 (diff)
handle failures from ports tree with more care.
this does avoid infinite loops in case of wrong plists. necessary since print-plist-with-depends CAN fail...
Diffstat (limited to 'usr.sbin/pkg_add/OpenBSD/Dependencies.pm')
-rw-r--r--usr.sbin/pkg_add/OpenBSD/Dependencies.pm8
1 files changed, 4 insertions, 4 deletions
diff --git a/usr.sbin/pkg_add/OpenBSD/Dependencies.pm b/usr.sbin/pkg_add/OpenBSD/Dependencies.pm
index 8f51fcac1fd..eae6bfee6ed 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.150 2010/12/21 17:43:07 espie Exp $
+# $OpenBSD: Dependencies.pm,v 1.151 2010/12/24 09:04:14 espie Exp $
#
# Copyright (c) 2005-2010 Marc Espie <espie@openbsd.org>
#
@@ -73,7 +73,7 @@ sub dump
my ($self, $state) = @_;
return unless %{$self->{done}};
- $state->say("Full dependency tree is #1",
+ $state->say("Full dependency tree is #1",
join(' ', keys %{$self->{done}}));
}
@@ -167,7 +167,7 @@ sub find_in_already_done
my ($self, $solver, $state, $obj) = @_;
my $r = $self->{known_tags}->{$obj};
if (defined $r) {
- $state->say("Found tag #1 in #2", $obj, $r)
+ $state->say("Found tag #1 in #2", $obj, $r)
if $state->verbose >= 3;
}
return $r;
@@ -590,7 +590,7 @@ sub find_dep_in_stuff_to_install
{
my ($self, $state, $dep) = @_;
- my $v = $self->find_candidate($dep,
+ my $v = $self->find_candidate($dep,
keys %{$state->tracker->{uptodate}});
if ($v) {
$self->set_global($dep, _cache::installed->new($v));