diff options
| author | Marc Espie <espie@cvs.openbsd.org> | 2007-05-27 21:43:07 +0000 |
|---|---|---|
| committer | Marc Espie <espie@cvs.openbsd.org> | 2007-05-27 21:43:07 +0000 |
| commit | bce2158538f718a0f95b0b16d23ac1be8a75b7b7 (patch) | |
| tree | aacfcfc5c665331fc56b35c1e3de1bb396879f5b | |
| parent | b00b2bb89195f937093fd37adcf4e0e5cbe71650 (diff) | |
comment out some of this code. Currently, we don't know how to recover
from collision with old libs (and the result from figure_out_old_libs says
so), so don't pretend we're doing anything significant with them...
| -rw-r--r-- | usr.sbin/pkg_add/OpenBSD/Replace.pm | 9 | ||||
| -rw-r--r-- | usr.sbin/pkg_add/pkg_add | 8 |
2 files changed, 9 insertions, 8 deletions
diff --git a/usr.sbin/pkg_add/OpenBSD/Replace.pm b/usr.sbin/pkg_add/OpenBSD/Replace.pm index 7d5b706cba5..8ce1a6cad0f 100644 --- a/usr.sbin/pkg_add/OpenBSD/Replace.pm +++ b/usr.sbin/pkg_add/OpenBSD/Replace.pm @@ -1,5 +1,5 @@ # ex:ts=8 sw=4: -# $OpenBSD: Replace.pm,v 1.19 2007/05/27 21:33:55 espie Exp $ +# $OpenBSD: Replace.pm,v 1.20 2007/05/27 21:43:06 espie Exp $ # # Copyright (c) 2004-2006 Marc Espie <espie@openbsd.org> # @@ -463,19 +463,20 @@ sub figure_out_libs $p->{items} = $n; if ($doit) { print "some found\n" if $state->{verbose}; + # XXX we don't use this code yet my $dummy = {items => $delete}; push(@$result, { plist => $p, todelete => $dummy, empty => $empty}); - require OpenBSD::Delete; - OpenBSD::Delete::validate_plist($p, $state); + #require OpenBSD::Delete; + #OpenBSD::Delete::validate_plist($p, $state); } else { print "none found\n" if $state->{verbose}; } } if (@$result) { - $plist->{old_libs} = $result; + #$plist->{old_libs} = $result; return 0; } return 1; diff --git a/usr.sbin/pkg_add/pkg_add b/usr.sbin/pkg_add/pkg_add index ba18772e41c..9fdc047400f 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.278 2007/05/27 21:33:55 espie Exp $ +# $OpenBSD: pkg_add,v 1.279 2007/05/27 21:43:06 espie Exp $ # # Copyright (c) 2003-2007 Marc Espie <espie@openbsd.org> # @@ -317,9 +317,9 @@ sub really_add if (@toreplace) { $replacing = 1; } - if (defined $plist->{old_libs}) { - $replacing = 1; - } +# if (defined $plist->{old_libs}) { +# $replacing = 1; +# } $state->{replacing} = $replacing; my $header = $pkgname; |