diff options
Diffstat (limited to 'usr.sbin/pkg_add/OpenBSD/Add.pm')
| -rw-r--r-- | usr.sbin/pkg_add/OpenBSD/Add.pm | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/usr.sbin/pkg_add/OpenBSD/Add.pm b/usr.sbin/pkg_add/OpenBSD/Add.pm index 9f0275086f2..2b9c3c77afd 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.118 2010/12/24 09:09:54 espie Exp $ +# $OpenBSD: Add.pm,v 1.119 2010/12/29 13:03:05 espie Exp $ # # Copyright (c) 2003-2007 Marc Espie <espie@openbsd.org> # @@ -50,11 +50,11 @@ sub manpages_index sub register_installation { - my $plist = shift; - return if $main::not; + my ($plist, $state) = @_; + return if $state->{not}; my $dest = installed_info($plist->pkgname); mkdir($dest); - $plist->copy_info($dest); + $plist->copy_info($dest, $state); $plist->set_infodir($dest); $plist->to_installation; } @@ -687,12 +687,12 @@ sub prepare_for_addition sub copy_info { - my ($self, $dest) = @_; + my ($self, $dest, $state) = @_; require File::Copy; File::Copy::move($self->fullname, $dest) or - print STDERR "Problem while moving ", $self->fullname, - " into $dest: $!\n"; + $state->errsay("Problem while moving #1 into #2: #3", + $self->fullname, $dest, $!); } package OpenBSD::PackingElement::FINSTALL; |