diff options
| author | Marc Espie <espie@cvs.openbsd.org> | 2011-06-20 09:41:47 +0000 |
|---|---|---|
| committer | Marc Espie <espie@cvs.openbsd.org> | 2011-06-20 09:41:47 +0000 |
| commit | 17d33c197045faaad1553f873074f3092dede559 (patch) | |
| tree | b3828af00da784efaadbf486f7958b316e8f8e77 /usr.sbin | |
| parent | 7d6cfbdb805883d0cd2079f7092313a70b625821 (diff) | |
zap extra try that's no longer needed: print-plist-with-depends should
always succeed since it only depends on the ports tree itself.
Diffstat (limited to 'usr.sbin')
| -rw-r--r-- | usr.sbin/pkg_add/OpenBSD/PkgCreate.pm | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/usr.sbin/pkg_add/OpenBSD/PkgCreate.pm b/usr.sbin/pkg_add/OpenBSD/PkgCreate.pm index 80e4a8cd4cf..4c8b323d3f7 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.45 2011/06/15 10:12:13 espie Exp $ +# $OpenBSD: PkgCreate.pm,v 1.46 2011/06/20 09:41:46 espie Exp $ # # Copyright (c) 2003-2010 Marc Espie <espie@openbsd.org> # @@ -444,7 +444,7 @@ sub makesum_plist my $tempname = $state->{mandir}."/".$fullname; require File::Path; File::Path::make_path($state->{mandir}."/".$d); - open my $fh, ">", $tempname or $state->error("can't create #1: #2", + open my $fh, ">", $tempname or $state->error("can't create #1: #2", $tempname, $!); chmod 0444, $fh; if (-d $state->{base}.$d) { @@ -603,10 +603,6 @@ sub solve_from_ports my $plist = $self->ask_tree($state, $dep, $portsdir, 'print-plist-with-depends'); if ($? != 0 || !defined $plist->pkgname) { - $plist = $self->ask_tree($state, $dep, $portsdir, - 'print-plist'); - } - if ($? != 0 || !defined $plist->pkgname) { $state->error("Can't obtain dependency #1 from ports tree", $dep->{pattern}); return undef; @@ -1067,7 +1063,7 @@ sub finish_manpages require OpenBSD::Makewhatis; try { - OpenBSD::Makewhatis::scan_manpages($state->{manpages}, + OpenBSD::Makewhatis::scan_manpages($state->{manpages}, $state); } catchall { $state->errsay("Error in makewhatis: #1", $_); |