summaryrefslogtreecommitdiff
path: root/usr.sbin/pkg_add/pkg_add
diff options
context:
space:
mode:
Diffstat (limited to 'usr.sbin/pkg_add/pkg_add')
-rw-r--r--usr.sbin/pkg_add/pkg_add9
1 files changed, 5 insertions, 4 deletions
diff --git a/usr.sbin/pkg_add/pkg_add b/usr.sbin/pkg_add/pkg_add
index 3c0b814ef8d..bfdb78f28bc 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.94 2004/11/06 12:19:16 espie Exp $
+# $OpenBSD: pkg_add,v 1.95 2004/11/07 12:19:20 espie Exp $
#
# Copyright (c) 2003-2004 Marc Espie <espie@openbsd.org>
#
@@ -155,9 +155,9 @@ sub pre_add($$)
if ($toreplace ne '1') {
$plist->{replacing} = $toreplace;
$avoid = $toreplace->pkgname();
- if (!OpenBSD::Update::verify_libs($plist, $state)) {
- return undef;
- }
+# if (!OpenBSD::Update::verify_libs($plist, $state)) {
+# return undef;
+# }
}
# second handling of conflicts
my $l = OpenBSD::PkgCfl->make_conflict_list($plist);
@@ -462,6 +462,7 @@ sub really_add($$)
if (defined $plist->{replacing}) {
require OpenBSD::Update;
+ OpenBSD::Update::save_old_libraries($plist, $state);
$plist->visit('extract', $state);
require OpenBSD::Delete;