diff options
| author |   espie <espie@openbsd.org> | 2010-08-13 11:12:43 +0000 |
|---|---|---|
| committer | espie <espie@openbsd.org> | 2010-08-13 11:12:43 +0000 |
| commit | b68edd66137c1ecc37d52a493a4811feb0868807 (patch) | |
| tree | 8026123ddf28c901d361d8caa5433b4e583267e2 | |
| parent | whitespace (diff) | |
| download | wireguard-openbsd-b68edd66137c1ecc37d52a493a4811feb0868807.tar.xz wireguard-openbsd-b68edd66137c1ecc37d52a493a4811feb0868807.zip | |
bad works better if you push consistent stuff in it, like always strings...
| -rw-r--r-- | usr.sbin/pkg_add/OpenBSD/Dependencies.pm | 9 | ||||
| -rw-r--r-- | usr.sbin/pkg_add/OpenBSD/PkgAdd.pm | 8 |
2 files changed, 8 insertions, 9 deletions
diff --git a/usr.sbin/pkg_add/OpenBSD/Dependencies.pm b/usr.sbin/pkg_add/OpenBSD/Dependencies.pm index b6976465f5a..06bdc81f9d8 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.133 2010/08/07 10:26:58 espie Exp $ +# $OpenBSD: Dependencies.pm,v 1.134 2010/08/13 11:12:43 espie Exp $ # # Copyright (c) 2005-2010 Marc Espie <espie@openbsd.org> # @@ -533,7 +533,7 @@ sub solve_dependency } $v = find_candidate($dep->spec, $self->{set}->older_names); if ($v) { - push(@{$self->{bad}}, $dep); + push(@{$self->{bad}}, $dep->{pattern}); return $v; } $v = $self->find_dep_in_stuff_to_install($state, $dep); @@ -602,14 +602,13 @@ sub solve_depends sub check_depends { my $self = shift; - my @bad = (@{$self->{bad}}); for my $dep ($self->dependencies) { - push(@bad, $dep) + push(@{$self->{bad}}, $dep) unless is_installed($dep) or defined $self->{set}->{newer}->{$dep}; } - return @bad; + return $self->{bad}; } sub dump diff --git a/usr.sbin/pkg_add/OpenBSD/PkgAdd.pm b/usr.sbin/pkg_add/OpenBSD/PkgAdd.pm index e863f373a7f..d7a7b95d10a 100644 --- a/usr.sbin/pkg_add/OpenBSD/PkgAdd.pm +++ b/usr.sbin/pkg_add/OpenBSD/PkgAdd.pm @@ -1,7 +1,7 @@ #! /usr/bin/perl # ex:ts=8 sw=4: -# $OpenBSD: PkgAdd.pm,v 1.13 2010/08/07 09:37:44 espie Exp $ +# $OpenBSD: PkgAdd.pm,v 1.14 2010/08/13 11:12:43 espie Exp $ # # Copyright (c) 2003-2010 Marc Espie <espie@openbsd.org> # @@ -877,11 +877,11 @@ sub install_set } # verify dependencies have been installed - my @baddeps = $set->solver->check_depends; + my $baddeps = $set->solver->check_depends; - if (@baddeps) { + if (@$baddeps) { $state->errsay("Can't install #1: can't resolve #2", - $set->print, join(',', map {$_->{pattern}} @baddeps)); + $set->print, join(',', @$baddeps)); $state->{bad}++; $set->cleanup(OpenBSD::Handle::CANT_INSTALL,"bad dependencies"); $state->tracker->cant($set); |