diff options
| author | Marc Espie <espie@cvs.openbsd.org> | 2008-03-02 23:43:33 +0000 |
|---|---|---|
| committer | Marc Espie <espie@cvs.openbsd.org> | 2008-03-02 23:43:33 +0000 |
| commit | f2d04a500e36a76806f853d56e29278e59eaee2d (patch) | |
| tree | 2731abaaedd0eb5ed425444cc0abd19dd82cabd1 /usr.sbin/pkg_add/OpenBSD | |
| parent | 498f323dc1a0ad31653947caaebe4221f05d164f (diff) | |
fix pkg_add -r -B
problem noticed by winiger@
Diffstat (limited to 'usr.sbin/pkg_add/OpenBSD')
| -rw-r--r-- | usr.sbin/pkg_add/OpenBSD/Replace.pm | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/usr.sbin/pkg_add/OpenBSD/Replace.pm b/usr.sbin/pkg_add/OpenBSD/Replace.pm index 756598fbd76..a94382537ea 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.42 2007/06/18 10:47:03 espie Exp $ +# $OpenBSD: Replace.pm,v 1.43 2008/03/02 23:43:32 espie Exp $ # # Copyright (c) 2004-2006 Marc Espie <espie@openbsd.org> # @@ -119,8 +119,11 @@ sub extract my ($fh, $tempname) = OpenBSD::Temp::permanent_file($d, "pkg"); print "extracting $tempname\n" if $state->{very_verbose}; - $file->{name} = $tempname; $self->{tempname} = $tempname; + + # XXX don't apply destdir twice + $file->{destdir} = ''; + $file->{name} = $tempname; $file->create; } } |