diff options
| author |   espie <espie@openbsd.org> | 2012-04-30 10:43:51 +0000 |
|---|---|---|
| committer | espie <espie@openbsd.org> | 2012-04-30 10:43:51 +0000 |
| commit | 807133b72786981bae7a5137784286a91070d79b (patch) | |
| tree | 249ea61ec2047fba45ccdeb0b25813d4e1de8cca | |
| parent | just a bit of refactoring, make sure option handling is done in state, (diff) | |
| download | wireguard-openbsd-807133b72786981bae7a5137784286a91070d79b.tar.xz wireguard-openbsd-807133b72786981bae7a5137784286a91070d79b.zip | |
more refactor
| -rw-r--r-- | usr.sbin/pkg_add/OpenBSD/PkgCreate.pm | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/usr.sbin/pkg_add/OpenBSD/PkgCreate.pm b/usr.sbin/pkg_add/OpenBSD/PkgCreate.pm index 17d7329e198..122bdeb3a47 100644 --- a/usr.sbin/pkg_add/OpenBSD/PkgCreate.pm +++ b/usr.sbin/pkg_add/OpenBSD/PkgCreate.pm @@ -1,6 +1,6 @@ #! /usr/bin/perl # ex:ts=8 sw=4: -# $OpenBSD: PkgCreate.pm,v 1.58 2012/04/30 10:32:12 espie Exp $ +# $OpenBSD: PkgCreate.pm,v 1.59 2012/04/30 10:43:51 espie Exp $ # # Copyright (c) 2003-2010 Marc Espie <espie@openbsd.org> # @@ -103,6 +103,16 @@ sub handle_options '[-L localbase] [-M displayfile] [-P pkg-dependency]', '[-s x509 -s cert -s priv] [-U undisplayfile] [-W wantedlib]', '-d desc -D COMMENT=value -f packinglist -p prefix pkg-name'); + + my $base = '/'; + if (defined $state->opt('B')) { + $base = $state->opt('B'); + } elsif (defined $ENV{'PKG_PREFIX'}) { + $base = $ENV{'PKG_PREFIX'}; + } + + $state->{base} = $base; + } package OpenBSD::PkgCreate; @@ -1229,15 +1239,6 @@ sub parse_and_run } - my $base = '/'; - if (defined $state->opt('B')) { - $base = $state->opt('B'); - } elsif (defined $ENV{'PKG_PREFIX'}) { - $base = $ENV{'PKG_PREFIX'}; - } - - $state->{base} = $base; - $plist->discover_directories($state); unless (defined $state->opt('q') && defined $state->opt('n')) { $state->set_status("checking dependencies"); |