diff options
| author | Marc Espie <espie@cvs.openbsd.org> | 2007-05-29 14:39:04 +0000 |
|---|---|---|
| committer | Marc Espie <espie@cvs.openbsd.org> | 2007-05-29 14:39:04 +0000 |
| commit | 2d7c5d871344801948f27bb9b5396c0e00cb15e9 (patch) | |
| tree | 35eb46920511a0ac5bd7ea18abdd11347e0e9f5b /usr.sbin/pkg_add/OpenBSD/Add.pm | |
| parent | f92abc16c1ff335882c34e18a23d0daf2b5b03f8 (diff) | |
rely on packing-lists knowing where they live, much saner.
Diffstat (limited to 'usr.sbin/pkg_add/OpenBSD/Add.pm')
| -rw-r--r-- | usr.sbin/pkg_add/OpenBSD/Add.pm | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/usr.sbin/pkg_add/OpenBSD/Add.pm b/usr.sbin/pkg_add/OpenBSD/Add.pm index 85b596d3336..d88c1690c9a 100644 --- a/usr.sbin/pkg_add/OpenBSD/Add.pm +++ b/usr.sbin/pkg_add/OpenBSD/Add.pm @@ -1,5 +1,5 @@ # ex:ts=8 sw=4: -# $OpenBSD: Add.pm,v 1.59 2007/05/29 13:52:07 espie Exp $ +# $OpenBSD: Add.pm,v 1.60 2007/05/29 14:39:03 espie Exp $ # # Copyright (c) 2003-2007 Marc Espie <espie@openbsd.org> # @@ -49,7 +49,6 @@ sub register_installation my $plist = shift; return if $main::not; my $dest = installed_info($plist->pkgname); - my $dir = $plist->infodir; mkdir($dest); $plist->copy_info($dest); $plist->set_infodir($dest); @@ -69,7 +68,7 @@ sub validate_plist sub borked_installation { - my ($plist, $dir, $not, @msg) = @_; + my ($plist, $not, @msg) = @_; Fatal @msg if $not; use OpenBSD::PackingElement; @@ -560,7 +559,7 @@ sub prepare_for_addition my ($self, $state, $pkgname) = @_; my $fname = installed_info($pkgname).$self->{name}; - my $cname = $state->{dir}.'/'.$self->{name}; + my $cname = $self->fullname; my $size = $self->{size}; if (!defined $size) { $size = (stat $cname)[7]; |