diff options
| author |   espie <espie@openbsd.org> | 2015-04-06 11:07:24 +0000 |
|---|---|---|
| committer | espie <espie@openbsd.org> | 2015-04-06 11:07:24 +0000 |
| commit | d83f47928193cadf3e2dd5ac6a44e7fed08e3045 (patch) | |
| tree | 1a3f924191c01dee603cbe20307beb474141286a | |
| parent | drm_calloc -> kcalloc (diff) | |
| download | wireguard-openbsd-d83f47928193cadf3e2dd5ac6a44e7fed08e3045.tar.xz wireguard-openbsd-d83f47928193cadf3e2dd5ac6a44e7fed08e3045.zip | |
move signer_list up so pkg_info can use it
| -rw-r--r-- | usr.sbin/pkg_add/OpenBSD/AddCreateDelete.pm | 16 | ||||
| -rw-r--r-- | usr.sbin/pkg_add/OpenBSD/State.pm | 16 |
2 files changed, 16 insertions, 16 deletions
diff --git a/usr.sbin/pkg_add/OpenBSD/AddCreateDelete.pm b/usr.sbin/pkg_add/OpenBSD/AddCreateDelete.pm index dadf890bb85..7208768e269 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.33 2015/02/09 11:01:08 espie Exp $ +# $OpenBSD: AddCreateDelete.pm,v 1.34 2015/04/06 11:07:24 espie Exp $ # # Copyright (c) 2007-2014 Marc Espie <espie@openbsd.org> # @@ -145,20 +145,6 @@ sub ntogo_string $self->f(""); } -OpenBSD::Auto::cache(signer_list, - sub { - my $self = shift; - if ($self->defines('SIGNER')) { - return [split /,/, $self->{subst}->value('SIGNER')]; - } else { - if ($self->defines('FW_UPDATE')) { - return [qr{^.*fw$}]; - } else { - return [qr{^.*pkg$}]; - } - } - }); - package OpenBSD::AddCreateDelete; use OpenBSD::Error; diff --git a/usr.sbin/pkg_add/OpenBSD/State.pm b/usr.sbin/pkg_add/OpenBSD/State.pm index 27ab3407692..0411d77f07a 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.33 2014/11/30 15:56:15 espie Exp $ +# $OpenBSD: State.pm,v 1.34 2015/04/06 11:07:24 espie Exp $ # # Copyright (c) 2007-2014 Marc Espie <espie@openbsd.org> # @@ -348,6 +348,20 @@ sub defines return $self->{subst}->value($k); } +OpenBSD::Auto::cache(signer_list, + sub { + my $self = shift; + if ($self->defines('SIGNER')) { + return [split /,/, $self->{subst}->value('SIGNER')]; + } else { + if ($self->defines('FW_UPDATE')) { + return [qr{^.*fw$}]; + } else { + return [qr{^.*pkg$}]; + } + } + }); + my @signal_name = (); sub fillup_names { |