summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorespie <espie@openbsd.org>2015-04-06 12:19:35 +0000
committerespie <espie@openbsd.org>2015-04-06 12:19:35 +0000
commit9d1c4b6681e78e079b3735efddee87d9e4fcfa2e (patch)
tree31ae8af3ee06eaa05633db2ec408428c8b6cdf84
parentmake pkg_info run slightly slower on distant packages, but do check that (diff)
downloadwireguard-openbsd-9d1c4b6681e78e079b3735efddee87d9e4fcfa2e.tar.xz
wireguard-openbsd-9d1c4b6681e78e079b3735efddee87d9e4fcfa2e.zip
don't check this twice.
-rw-r--r--usr.sbin/pkg_add/OpenBSD/PkgInfo.pm5
1 files changed, 3 insertions, 2 deletions
diff --git a/usr.sbin/pkg_add/OpenBSD/PkgInfo.pm b/usr.sbin/pkg_add/OpenBSD/PkgInfo.pm
index 5b6dd4ca80a..7fa35ae6870 100644
--- a/usr.sbin/pkg_add/OpenBSD/PkgInfo.pm
+++ b/usr.sbin/pkg_add/OpenBSD/PkgInfo.pm
@@ -1,6 +1,6 @@
#! /usr/bin/perl
# ex:ts=8 sw=4:
-# $OpenBSD: PkgInfo.pm,v 1.34 2015/04/06 11:14:58 espie Exp $
+# $OpenBSD: PkgInfo.pm,v 1.35 2015/04/06 12:19:35 espie Exp $
#
# Copyright (c) 2003-2014 Marc Espie <espie@openbsd.org>
#
@@ -376,7 +376,7 @@ sub may_check_data
{
my ($self, $handle, $pkgname, $state, $r) = @_;
# don't check installed packages
- return if $handle->trusted;
+ return if $handle->trusted || $handle->{checked};
require OpenBSD::PackingList;
$$r //= $handle->plist;
if ($$r->is_signed) {
@@ -394,6 +394,7 @@ sub may_check_data
$$r->get($name)->may_verify_digest($state);
}
}
+ $handle->{checked} = 1;
}
sub print_info