diff options
Diffstat (limited to 'usr.sbin')
| -rw-r--r-- | usr.sbin/pkg_add/OpenBSD/Add.pm | 12 | ||||
| -rw-r--r-- | usr.sbin/pkg_add/OpenBSD/Delete.pm | 4 | ||||
| -rw-r--r-- | usr.sbin/pkg_add/OpenBSD/PackingElement.pm | 7 |
3 files changed, 4 insertions, 19 deletions
diff --git a/usr.sbin/pkg_add/OpenBSD/Add.pm b/usr.sbin/pkg_add/OpenBSD/Add.pm index 9b3316d0e15..69a09ef9444 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.146 2014/02/03 15:57:13 espie Exp $ +# $OpenBSD: Add.pm,v 1.147 2014/02/03 16:13:13 espie Exp $ # # Copyright (c) 2003-2014 Marc Espie <espie@openbsd.org> # @@ -359,14 +359,6 @@ sub install $state->vsystem(OpenBSD::Paths->sysctl, '--', $name.'='.$self->{value}); } -package OpenBSD::PackingElement::DirBase; -sub prepare_for_addition -{ - my ($self, $state, $pkgname) = @_; - return unless $self->{noshadow}; - $state->{noshadow}{$state->{destdir}.$self->fullname} = 1; -} - package OpenBSD::PackingElement::FileBase; use OpenBSD::Error; use File::Basename; @@ -460,7 +452,7 @@ sub extract 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}) { + while (!-d $d && -e _) { $d = dirname($d); } if ($state->{not}) { diff --git a/usr.sbin/pkg_add/OpenBSD/Delete.pm b/usr.sbin/pkg_add/OpenBSD/Delete.pm index b4949b9361a..0f023c56b75 100644 --- a/usr.sbin/pkg_add/OpenBSD/Delete.pm +++ b/usr.sbin/pkg_add/OpenBSD/Delete.pm @@ -1,5 +1,5 @@ # ex:ts=8 sw=4: -# $OpenBSD: Delete.pm,v 1.130 2014/02/03 15:57:13 espie Exp $ +# $OpenBSD: Delete.pm,v 1.131 2014/02/03 16:13:13 espie Exp $ # # Copyright (c) 2003-2014 Marc Espie <espie@openbsd.org> # @@ -315,8 +315,6 @@ sub prepare_for_deletion my ($self, $state, $pkgname) = @_; my $fname = $state->{destdir}.$self->fullname; $state->vstat->remove_directory($fname, $self); - return unless $self->{noshadow}; - $state->{noshadow}{$fname} = 1; } sub delete diff --git a/usr.sbin/pkg_add/OpenBSD/PackingElement.pm b/usr.sbin/pkg_add/OpenBSD/PackingElement.pm index 5cf4c53d957..7fbd7088821 100644 --- a/usr.sbin/pkg_add/OpenBSD/PackingElement.pm +++ b/usr.sbin/pkg_add/OpenBSD/PackingElement.pm @@ -1,5 +1,5 @@ # ex:ts=8 sw=4: -# $OpenBSD: PackingElement.pm,v 1.229 2014/02/03 15:57:13 espie Exp $ +# $OpenBSD: PackingElement.pm,v 1.230 2014/02/03 16:13:13 espie Exp $ # # Copyright (c) 2003-2014 Marc Espie <espie@openbsd.org> # @@ -736,8 +736,6 @@ sub add if ($args eq 'no checksum') { $plist->{state}{lastfile}{nochecksum} = 1; - } elsif ($args eq 'no shadow') { - $plist->{state}{lastdir}{noshadow} = 1; } else { my $object = $plist->{state}{lastfileobject}; $object->{tags}{$args} = 1; @@ -1371,9 +1369,6 @@ sub write { my ($self, $fh) = @_; $self->SUPER::write($fh); - if (defined $self->{noshadow}) { - print $fh "\@tag no shadow\n"; - } } package OpenBSD::PackingElement::Dir; |