diff options
| author | Marc Espie <espie@cvs.openbsd.org> | 2016-09-14 12:35:41 +0000 |
|---|---|---|
| committer | Marc Espie <espie@cvs.openbsd.org> | 2016-09-14 12:35:41 +0000 |
| commit | 1b32d2741c47b017f79041012c71d975abb17ff0 (patch) | |
| tree | ea92257a0b099ef1b46cc2a3e14bc8ed2af4e84d /usr.sbin/pkg_add | |
| parent | 622bcf893f6e138ce680cb45f24a87a5c3ddd149 (diff) | |
tidy running those commands
Diffstat (limited to 'usr.sbin/pkg_add')
| -rw-r--r-- | usr.sbin/pkg_add/OpenBSD/PackageRepository.pm | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/usr.sbin/pkg_add/OpenBSD/PackageRepository.pm b/usr.sbin/pkg_add/OpenBSD/PackageRepository.pm index d9768d34486..f92d5ea7921 100644 --- a/usr.sbin/pkg_add/OpenBSD/PackageRepository.pm +++ b/usr.sbin/pkg_add/OpenBSD/PackageRepository.pm @@ -1,5 +1,5 @@ # ex:ts=8 sw=4: -# $OpenBSD: PackageRepository.pm,v 1.130 2016/09/14 12:30:52 espie Exp $ +# $OpenBSD: PackageRepository.pm,v 1.131 2016/09/14 12:35:40 espie Exp $ # # Copyright (c) 2003-2010 Marc Espie <espie@openbsd.org> # @@ -383,8 +383,9 @@ sub signify_pipe exec {OpenBSD::Paths->signify} ("signify", "-zV", - @_); - exit(1); + @_) + or $self->{state}->fatal("Can't run #1: #2", + OpenBSD::Paths->signify, $!); } sub check_signed @@ -793,7 +794,7 @@ sub grab_object @extra, "-o", "-", $self->url($object->{name}) - or $self->{state}->fatal("Can't run ".OpenBSD::Paths->ftp.": #1", $!); + or $self->{state}->fatal("Can't run #1: #2", OpenBSD::Paths->ftp, $!); } sub open_read_ftp @@ -808,7 +809,7 @@ sub open_read_ftp $self->drop_privileges_and_setup_env; exec($cmd) - or $self->{state}->fatal("Can't run $cmd: #1", $!); + or $self->{state}->fatal("Can't run #1: #2", $cmd, $!); } } |