From 3a52b1fe0efa851ba8fbf9437f803b773fcd201f Mon Sep 17 00:00:00 2001 From: espie Date: Tue, 10 Jul 2018 10:18:34 +0000 Subject: [PATCH] remove remnants of very old code, to simplify unification --- usr.sbin/pkg_add/OpenBSD/PkgDelete.pm | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/usr.sbin/pkg_add/OpenBSD/PkgDelete.pm b/usr.sbin/pkg_add/OpenBSD/PkgDelete.pm index a5312ab4947..472ec0c7394 100644 --- a/usr.sbin/pkg_add/OpenBSD/PkgDelete.pm +++ b/usr.sbin/pkg_add/OpenBSD/PkgDelete.pm @@ -1,6 +1,6 @@ #!/usr/bin/perl # ex:ts=8 sw=4: -# $OpenBSD: PkgDelete.pm,v 1.43 2018/06/24 19:59:35 espie Exp $ +# $OpenBSD: PkgDelete.pm,v 1.44 2018/07/10 10:18:34 espie Exp $ # # Copyright (c) 2003-2010 Marc Espie # @@ -103,18 +103,11 @@ sub handle_options $state->SUPER::handle_options('X', '[-acimnqsVvXx] [-B pkg-destdir] [-D name[=value]] [pkg-name ...]'); - my $base = $state->opt('B') // $ENV{'PKG_DESTDIR'} // ''; + my $base = $state->opt('B') // ''; if ($base ne '') { $base.='/' unless $base =~ m/\/$/o; } - $ENV{'PKG_DESTDIR'} = $base; - $state->{destdir} = $base; - if ($base eq '') { - $state->{destdirname} = ''; - } else { - $state->{destdirname} = '${PKG_DESTDIR}'; - } $state->{exclude} = $state->opt('X'); } -- 2.20.1