diff options
| -rw-r--r-- | usr.sbin/pkg_add/OpenBSD/Add.pm | 11 | ||||
| -rw-r--r-- | usr.sbin/pkg_add/OpenBSD/PackageLocator.pm | 8 |
2 files changed, 14 insertions, 5 deletions
diff --git a/usr.sbin/pkg_add/OpenBSD/Add.pm b/usr.sbin/pkg_add/OpenBSD/Add.pm index d2074614516..3219e26c0c5 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.44 2005/11/02 17:01:26 bernd Exp $ +# $OpenBSD: Add.pm,v 1.45 2005/11/02 22:26:51 espie Exp $ # # Copyright (c) 2003-2004 Marc Espie <espie@openbsd.org> # @@ -345,10 +345,13 @@ sub install my $file = $self->prepare_to_extract($state); print "extracting $destdir$fullname\n" if $state->{very_verbose}; - return if $state->{not}; - $file->create(); + if ($state->{not}) { + $state->{archive}->skip(); + } else { + $file->create(); + $self->set_modes($destdir.$fullname); + } } - $self->set_modes($destdir.$fullname); } sub prepare_to_extract diff --git a/usr.sbin/pkg_add/OpenBSD/PackageLocator.pm b/usr.sbin/pkg_add/OpenBSD/PackageLocator.pm index 4eba0b4beca..58fe47361bc 100644 --- a/usr.sbin/pkg_add/OpenBSD/PackageLocator.pm +++ b/usr.sbin/pkg_add/OpenBSD/PackageLocator.pm @@ -1,5 +1,5 @@ # ex:ts=8 sw=4: -# $OpenBSD: PackageLocator.pm,v 1.46 2005/10/25 23:38:51 espie Exp $ +# $OpenBSD: PackageLocator.pm,v 1.47 2005/11/02 22:26:51 espie Exp $ # # Copyright (c) 2003-2004 Marc Espie <espie@openbsd.org> # @@ -838,6 +838,12 @@ sub getNext return $self->{_archive}->next(); } +sub skip +{ + my $self = shift; + return $self->{_archive}->skip(); +} + package OpenBSD::FatPackageLocation; our @ISA=qw(OpenBSD::PackageLocation); |