summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorespie <espie@openbsd.org>2015-01-12 18:27:33 +0000
committerespie <espie@openbsd.org>2015-01-12 18:27:33 +0000
commitad60389db76d48aba89193815ba7dfcd59a463c9 (patch)
tree85e99b9ebc20aba560ef671ccedbfdf36ae2313d
parentFix axen(4) build with AXEN_DEBUG defined. From Fabien Raetz. (diff)
downloadwireguard-openbsd-ad60389db76d48aba89193815ba7dfcd59a463c9.tar.xz
wireguard-openbsd-ad60389db76d48aba89193815ba7dfcd59a463c9.zip
oops, don't load quirks prematurely. noticed by many, myself included
-rw-r--r--usr.sbin/pkg_add/OpenBSD/PkgAdd.pm3
1 files changed, 2 insertions, 1 deletions
diff --git a/usr.sbin/pkg_add/OpenBSD/PkgAdd.pm b/usr.sbin/pkg_add/OpenBSD/PkgAdd.pm
index 9741e955a84..c3882b4563f 100644
--- a/usr.sbin/pkg_add/OpenBSD/PkgAdd.pm
+++ b/usr.sbin/pkg_add/OpenBSD/PkgAdd.pm
@@ -1,7 +1,7 @@
#! /usr/bin/perl
# ex:ts=8 sw=4:
-# $OpenBSD: PkgAdd.pm,v 1.80 2014/12/24 12:50:22 espie Exp $
+# $OpenBSD: PkgAdd.pm,v 1.81 2015/01/12 18:27:33 espie Exp $
#
# Copyright (c) 2003-2014 Marc Espie <espie@openbsd.org>
#
@@ -271,6 +271,7 @@ sub check_security
my ($set, $state, $plist, $h) = @_;
return if $checked->{$plist->fullpkgpath};
$checked->{$plist->fullpkgpath} = 1;
+ return if $set->{quirks};
my ($error, $bad);
$state->run_quirks(
sub {