diff options
| author | Marc Espie <espie@cvs.openbsd.org> | 2009-04-19 14:58:33 +0000 |
|---|---|---|
| committer | Marc Espie <espie@cvs.openbsd.org> | 2009-04-19 14:58:33 +0000 |
| commit | ec8ddac0b1b2a0ba80424a1b47bb6bab9e35bcf5 (patch) | |
| tree | d6cca43827cdc725b832e2a73bf959a6200d61f2 /usr.sbin/pkg_add/OpenBSD/Replace.pm | |
| parent | 087733393d1622a68046244a995781b5af3496b2 (diff) | |
synch with my new style search/location changes
It's likely there will be some fallout, but it's getting a bit too large
to keep around.
This does kill a few very old oddities as well.
Diffstat (limited to 'usr.sbin/pkg_add/OpenBSD/Replace.pm')
| -rw-r--r-- | usr.sbin/pkg_add/OpenBSD/Replace.pm | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/usr.sbin/pkg_add/OpenBSD/Replace.pm b/usr.sbin/pkg_add/OpenBSD/Replace.pm index 7c676b9b198..4226c739210 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.48 2009/03/05 10:44:59 espie Exp $ +# $OpenBSD: Replace.pm,v 1.49 2009/04/19 14:58:32 espie Exp $ # # Copyright (c) 2004-2006 Marc Espie <espie@openbsd.org> # @@ -103,7 +103,7 @@ sub extract $self->SUPER::extract($state); # figure out a safe directory where to put the temp file - my $d = dirname($file->{destdir}.$file->{name}); + my $d = dirname($file->{destdir}.$file->name); # we go back up until we find an existing directory. # hopefully this will be on the same file system. while (!-d $d && -e _ || defined $state->{noshadow}->{$d}) { @@ -123,7 +123,7 @@ sub extract # XXX don't apply destdir twice $file->{destdir} = ''; - $file->{name} = $tempname; + $file->set_name($tempname); $file->create; $self->may_check_digest($file, $state); } @@ -158,7 +158,7 @@ package OpenBSD::PackingElement::ScriptFile; sub update_issue { my ($self, $installing) = @_; - return $self->{name}." script"; + return $self->name." script"; } package OpenBSD::PackingElement::FINSTALL; |