fix pkg_mklocatedb

4 files changed, 8 insertions, 5 deletions

diff --git a/usr.sbin/pkg_add/OpenBSD/AddCreateDelete.pm b/usr.sbin/pkg_add/OpenBSD/AddCreateDelete.pm
index 86b022d77bd..2d7a73d476b 100644
--- a/usr.sbin/pkg_add/OpenBSD/AddCreateDelete.pm
+++ b/usr.sbin/pkg_add/OpenBSD/AddCreateDelete.pm
@@ -1,5 +1,5 @@
 # ex:ts=8 sw=4:
-# $OpenBSD: AddCreateDelete.pm,v 1.10 2010/06/30 10:51:04 espie Exp $
+# $OpenBSD: AddCreateDelete.pm,v 1.11 2010/07/09 12:42:43 espie Exp $
 #
 # Copyright (c) 2007-2010 Marc Espie <espie@openbsd.org>
 #
@@ -34,6 +34,7 @@ sub init
 	$self->{progressmeter} = OpenBSD::ProgressMeter->new;
 	$self->{bad} = 0;
 	$self->SUPER::init;
+	$self->{export_level}++;
 }
 
 sub progress
diff --git a/usr.sbin/pkg_add/OpenBSD/AddDelete.pm b/usr.sbin/pkg_add/OpenBSD/AddDelete.pm
index 9a4b8f224a3..330e680d648 100644
--- a/usr.sbin/pkg_add/OpenBSD/AddDelete.pm
+++ b/usr.sbin/pkg_add/OpenBSD/AddDelete.pm
@@ -1,5 +1,5 @@
 # ex:ts=8 sw=4:
-# $OpenBSD: AddDelete.pm,v 1.35 2010/07/06 12:12:37 espie Exp $
+# $OpenBSD: AddDelete.pm,v 1.36 2010/07/09 12:42:43 espie Exp $
 #
 # Copyright (c) 2007-2010 Marc Espie <espie@openbsd.org>
 #
@@ -172,6 +172,7 @@ sub init
 	$self->{v} = 0;
 	$self->{wantntogo} = $self->config->istrue("ntogo");
 	$self->SUPER::init(@_);
+	$self->{export_level}++;
 }
 
 sub ntogo
diff --git a/usr.sbin/pkg_add/OpenBSD/PkgCreate.pm b/usr.sbin/pkg_add/OpenBSD/PkgCreate.pm
index 1ce356fbdbe..beac7f1e047 100644
--- a/usr.sbin/pkg_add/OpenBSD/PkgCreate.pm
+++ b/usr.sbin/pkg_add/OpenBSD/PkgCreate.pm
@@ -1,6 +1,6 @@
 #! /usr/bin/perl
 # ex:ts=8 sw=4:
-# $OpenBSD: PkgCreate.pm,v 1.20 2010/07/03 01:52:09 espie Exp $
+# $OpenBSD: PkgCreate.pm,v 1.21 2010/07/09 12:42:43 espie Exp $
 #
 # Copyright (c) 2003-2010 Marc Espie <espie@openbsd.org>
 #
diff --git a/usr.sbin/pkg_add/OpenBSD/State.pm b/usr.sbin/pkg_add/OpenBSD/State.pm
index e5818f4b13c..46ed107403c 100644
--- a/usr.sbin/pkg_add/OpenBSD/State.pm
+++ b/usr.sbin/pkg_add/OpenBSD/State.pm
@@ -1,5 +1,5 @@
 # ex:ts=8 sw=4:
-# $OpenBSD: State.pm,v 1.13 2010/07/04 19:27:26 espie Exp $
+# $OpenBSD: State.pm,v 1.14 2010/07/09 12:42:43 espie Exp $
 #
 # Copyright (c) 2007-2010 Marc Espie <espie@openbsd.org>
 #
@@ -172,6 +172,7 @@ sub init
 	my $self = shift;
 	$self->{subst} = OpenBSD::Subst->new;
 	$self->{repo} = OpenBSD::PackageRepositoryFactory->new($self);
+	$self->{export_level} = 1;
 }
 
 sub repo
@@ -324,7 +325,7 @@ sub handle_options
 		${"opt_$k"} = $state->opt($k);
 		push(@EXPORT, "\$opt_$k");
 	}
-	local $Exporter::ExportLevel = 1;
+	local $Exporter::ExportLevel = $state->{export_level};
 	import OpenBSD::State;
 }