diff options
| author | Marc Espie <espie@cvs.openbsd.org> | 2021-05-04 10:19:29 +0000 |
|---|---|---|
| committer | Marc Espie <espie@cvs.openbsd.org> | 2021-05-04 10:19:29 +0000 |
| commit | f72ae7c5352d52f0509747a6852f7fa30bcdf3c0 (patch) | |
| tree | 9cbe1bfba1db90ae12dc66595f5f8bef9ff351c7 /usr.sbin | |
| parent | 4aafdaee818af2c5e34597df5046d70177897524 (diff) | |
okay, prevent pkg_* from looking into /usr/local BUT special-case quirks
Diffstat (limited to 'usr.sbin')
| -rw-r--r-- | usr.sbin/pkg_add/OpenBSD/AddDelete.pm | 3 | ||||
| -rw-r--r-- | usr.sbin/pkg_add/pkg_add | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/usr.sbin/pkg_add/OpenBSD/AddDelete.pm b/usr.sbin/pkg_add/OpenBSD/AddDelete.pm index 5d5ab0d192f..7f61d446bdd 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.94 2021/01/30 10:24:19 espie Exp $ +# $OpenBSD: AddDelete.pm,v 1.95 2021/05/04 10:19:28 espie Exp $ # # Copyright (c) 2007-2010 Marc Espie <espie@openbsd.org> # @@ -347,6 +347,7 @@ sub run_quirks if (!exists $state->{quirks}) { eval { + use lib ('/usr/local/libdata/perl5/site_perl'); require OpenBSD::Quirks; # interface version number. $state->{quirks} = OpenBSD::Quirks->new(1); diff --git a/usr.sbin/pkg_add/pkg_add b/usr.sbin/pkg_add/pkg_add index 5d4e39be8f0..3b69bfec80c 100644 --- a/usr.sbin/pkg_add/pkg_add +++ b/usr.sbin/pkg_add/pkg_add @@ -1,6 +1,6 @@ #! /usr/bin/perl # ex:ts=8 sw=4: -# $OpenBSD: pkg_add,v 1.485 2021/05/04 08:53:15 espie Exp $ +# $OpenBSD: pkg_add,v 1.486 2021/05/04 10:19:28 espie Exp $ # # Copyright (c) 2010 Marc Espie <espie@openbsd.org> # @@ -18,7 +18,7 @@ use strict; use warnings; -#no lib ('/usr/local/libdata/perl5/site_perl'); +no lib ('/usr/local/libdata/perl5/site_perl'); sub run { |