diff options
| author | Marc Espie <espie@cvs.openbsd.org> | 2009-11-28 10:25:35 +0000 |
|---|---|---|
| committer | Marc Espie <espie@cvs.openbsd.org> | 2009-11-28 10:25:35 +0000 |
| commit | 35acad1fc4886a330c7ef85e984580c9b6de3708 (patch) | |
| tree | c99c2b629413a771b037a6dc2ca2b97db68c2c64 | |
| parent | 39b3222deb114c1aa0b82e61ee8d09af78a5afd6 (diff) | |
rework display of missing libs some more: first show the libraries, then
the dependency tree.
| -rw-r--r-- | usr.sbin/pkg_add/OpenBSD/Dependencies.pm | 15 | ||||
| -rw-r--r-- | usr.sbin/pkg_add/OpenBSD/SharedLibs.pm | 3 |
2 files changed, 10 insertions, 8 deletions
diff --git a/usr.sbin/pkg_add/OpenBSD/Dependencies.pm b/usr.sbin/pkg_add/OpenBSD/Dependencies.pm index 5bb6e0a48e2..0e5757def45 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.84 2009/11/11 12:32:03 espie Exp $ +# $OpenBSD: Dependencies.pm,v 1.85 2009/11/28 10:25:34 espie Exp $ # # Copyright (c) 2005-2007 Marc Espie <espie@openbsd.org> # @@ -472,18 +472,19 @@ sub solve_wantlibs next if $lib_finder->lookup($solver, $solver->{to_register}->{$h}, $state, $lib->{name}); - $state->errsay("Can't install ", - $h->pkgname, ": lib not found ", - $lib->{name}); if ($okay) { - $solver->dump; - $lib_finder->dump; - $okay = 0; + $state->errsay("Can't install ", + $h->pkgname, ":"); } + $okay = 0; OpenBSD::SharedLibs::report_problem( $state->{localbase}, $lib->{name}); } } + if (!$okay) { + $solver->dump; + $lib_finder->dump; + } return $okay; } diff --git a/usr.sbin/pkg_add/OpenBSD/SharedLibs.pm b/usr.sbin/pkg_add/OpenBSD/SharedLibs.pm index 2157c965743..837767b257c 100644 --- a/usr.sbin/pkg_add/OpenBSD/SharedLibs.pm +++ b/usr.sbin/pkg_add/OpenBSD/SharedLibs.pm @@ -1,5 +1,5 @@ # ex:ts=8 sw=4: -# $OpenBSD: SharedLibs.pm,v 1.37 2009/11/28 08:21:05 espie Exp $ +# $OpenBSD: SharedLibs.pm,v 1.38 2009/11/28 10:25:34 espie Exp $ # # Copyright (c) 2003-2005 Marc Espie <espie@openbsd.org> # @@ -226,6 +226,7 @@ sub report_problem } if (!defined $printed->{$name} || $printed->{$name} ne $r) { $printed->{$name} = $r; + print "library $name not found\n"; print $r; } } |