move the error saving code slightly around

still not perfect

2 files changed, 18 insertions, 21 deletions

diff --git a/usr.sbin/pkg_add/OpenBSD/PackageRepository.pm b/usr.sbin/pkg_add/OpenBSD/PackageRepository.pm
index a4d6da27117..39d06f6de4c 100644
--- a/usr.sbin/pkg_add/OpenBSD/PackageRepository.pm
+++ b/usr.sbin/pkg_add/OpenBSD/PackageRepository.pm
@@ -1,5 +1,5 @@
 # ex:ts=8 sw=4:
-# $OpenBSD: PackageRepository.pm,v 1.134 2016/09/14 14:14:22 espie Exp $
+# $OpenBSD: PackageRepository.pm,v 1.135 2016/09/15 12:53:08 espie Exp $
 #
 # Copyright (c) 2003-2010 Marc Espie <espie@openbsd.org>
 #
@@ -30,6 +30,17 @@ our @ISA=(qw(OpenBSD::PackageRepositoryBase));
 use OpenBSD::PackageLocation;
 use OpenBSD::Paths;
 use OpenBSD::Error;
+use OpenBSD::Temp;
+
+sub make_error_file
+{
+	my ($self, $object) = @_;
+	$object->{errors} = OpenBSD::Temp->file;
+	if (!defined $object->{errors}) {
+		$self->{state}->fatal("#1 not writable",
+		    $OpenBSD::Temp::tempbase);
+	}
+}
 
 sub baseurl
 {
@@ -161,7 +172,6 @@ sub wipe_info
 
 	my $dir = $pkg->{dir};
 	if (defined $dir) {
-		require OpenBSD::Temp;
 		OpenBSD::Error->rmtree($dir);
 		OpenBSD::Temp->reclaim($dir);
 		delete $pkg->{dir};
@@ -289,7 +299,7 @@ sub parse_problems
 			next if m/^ftp: Writing -: Broken pipe/o;
 			next if m/^421\s+/o;
 		}
-		s/.*unsigned archive.*/unsigned package/;
+		s/.*unsigned .*archive.*/unsigned package/;
 		if ($notyet) {
 			$self->{state}->errsay("Error from #1", $url);
 			$notyet = 0;
@@ -541,7 +551,6 @@ sub pkg_copy
 {
 	my ($self, $in, $object) = @_;
 
-	require OpenBSD::Temp;
 	my $name = $object->{name};
 	my $dir = $object->{cache_dir};
 
@@ -596,20 +605,8 @@ sub pkg_copy
 	close($in);
 }
 
-sub make_error_file
-{
-	my ($self, $object) = @_;
-	$object->{errors} = OpenBSD::Temp->file;
-	if (!defined $object->{errors}) {
-		$self->{state}->fatal("#1 not writable",
-		    $OpenBSD::Temp::tempbase);
-	}
-}
-
 sub open_pipe
 {
-	require OpenBSD::Temp;
-
 	my ($self, $object) = @_;
 	$self->make_error_file($object);
 	my $d = $ENV{'PKG_CACHE'};
diff --git a/usr.sbin/pkg_add/OpenBSD/PackageRepository/Installed.pm b/usr.sbin/pkg_add/OpenBSD/PackageRepository/Installed.pm
index f53d252d30c..034392f33f7 100644
--- a/usr.sbin/pkg_add/OpenBSD/PackageRepository/Installed.pm
+++ b/usr.sbin/pkg_add/OpenBSD/PackageRepository/Installed.pm
@@ -1,5 +1,5 @@
 # ex:ts=8 sw=4:
-# $OpenBSD: Installed.pm,v 1.36 2016/09/14 13:42:19 espie Exp $
+# $OpenBSD: Installed.pm,v 1.37 2016/09/15 12:53:08 espie Exp $
 #
 # Copyright (c) 2007-2014 Marc Espie <espie@openbsd.org>
 #
@@ -92,10 +92,6 @@ sub strip_urlscheme
 	return 0;
 }
 
-sub make_error_file
-{
-}
-
 sub match_locations
 {
 	my ($self, $search, @filters) = @_;
@@ -204,6 +200,10 @@ sub close
 {
 }
 
+sub make_error_file
+{
+}
+
 sub canonicalize
 {
 	my ($self, $name) = @_;