summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorespie <espie@openbsd.org>2007-05-31 16:50:43 +0000
committerespie <espie@openbsd.org>2007-05-31 16:50:43 +0000
commit98e015ec389b44b9f4b95793a3e5d10b66a48225 (patch)
treeb89fa47ee1c7cbe6a19742d6f2c8bc98e771d8b7
parentsimplify the handling of shared libs: there's no need to register each (diff)
downloadwireguard-openbsd-98e015ec389b44b9f4b95793a3e5d10b66a48225.tar.xz
wireguard-openbsd-98e015ec389b44b9f4b95793a3e5d10b66a48225.zip
we cannot install a package without a solver, remove redundant test.
-rw-r--r--usr.sbin/pkg_add/pkg_add8
1 files changed, 3 insertions, 5 deletions
diff --git a/usr.sbin/pkg_add/pkg_add b/usr.sbin/pkg_add/pkg_add
index d5c41638012..4fd61cf6b4a 100644
--- a/usr.sbin/pkg_add/pkg_add
+++ b/usr.sbin/pkg_add/pkg_add
@@ -1,7 +1,7 @@
#! /usr/bin/perl
# ex:ts=8 sw=4:
-# $OpenBSD: pkg_add,v 1.298 2007/05/31 16:48:18 espie Exp $
+# $OpenBSD: pkg_add,v 1.299 2007/05/31 16:50:43 espie Exp $
#
# Copyright (c) 2003-2007 Marc Espie <espie@openbsd.org>
#
@@ -441,11 +441,9 @@ sub really_add
OpenBSD::SharedLibs::add_libs_from_plist($plist);
$plist->to_cache;
OpenBSD::Add::register_installation($plist);
- delete $handle->{partial};
- if (defined $handle->{solver}) {
- $handle->{solver}->register_dependencies;
- }
+ $handle->{solver}->register_dependencies;
add_installed($pkgname);
+ delete $handle->{partial};
OpenBSD::PkgCfl::register($plist, $state);
if ($plist->has(DISPLAY)) {
$plist->get(DISPLAY)->prepare($state);