diff options
| author |   espie <espie@openbsd.org> | 2017-03-07 14:35:40 +0000 |
|---|---|---|
| committer | espie <espie@openbsd.org> | 2017-03-07 14:35:40 +0000 |
| commit | a806879e7fb227f81767bd38ef1b3cca177fb102 (patch) | |
| tree | f8a76cc75cd111bea15f9b2f9d3eff997706772c | |
| parent | get rid of redundant "Can't find CONTENTS" if the location already twitted (diff) | |
| download | wireguard-openbsd-a806879e7fb227f81767bd38ef1b3cca177fb102.tar.xz wireguard-openbsd-a806879e7fb227f81767bd38ef1b3cca177fb102.zip | |
if we reported "Can't find CONTENTS", we know it's a bad package,
so no need to say it again
| -rw-r--r-- | usr.sbin/pkg_add/OpenBSD/Handle.pm | 9 | ||||
| -rw-r--r-- | usr.sbin/pkg_add/OpenBSD/PkgAdd.pm | 5 |
2 files changed, 11 insertions, 3 deletions
diff --git a/usr.sbin/pkg_add/OpenBSD/Handle.pm b/usr.sbin/pkg_add/OpenBSD/Handle.pm index 4d8810d4d3f..10221736d12 100644 --- a/usr.sbin/pkg_add/OpenBSD/Handle.pm +++ b/usr.sbin/pkg_add/OpenBSD/Handle.pm @@ -1,5 +1,5 @@ # ex:ts=8 sw=4: -# $OpenBSD: Handle.pm,v 1.40 2017/03/07 14:20:01 espie Exp $ +# $OpenBSD: Handle.pm,v 1.41 2017/03/07 14:35:40 espie Exp $ # # Copyright (c) 2007-2009 Marc Espie <espie@openbsd.org> # @@ -134,6 +134,12 @@ sub has_error return $self->{error}; } +sub has_reported_error +{ + my $self = shift; + return $self->{error_reported}; +} + sub error_message { my $self = shift; @@ -240,6 +246,7 @@ sub get_plist $location->close_with_client_error; $location->wipe_info; $handle->set_error(BAD_PACKAGE); + $handle->{error_reported} = 1; return; } delete $location->{update_info}; diff --git a/usr.sbin/pkg_add/OpenBSD/PkgAdd.pm b/usr.sbin/pkg_add/OpenBSD/PkgAdd.pm index c49dfe6f56d..65096d00e16 100644 --- a/usr.sbin/pkg_add/OpenBSD/PkgAdd.pm +++ b/usr.sbin/pkg_add/OpenBSD/PkgAdd.pm @@ -1,7 +1,7 @@ #! /usr/bin/perl # ex:ts=8 sw=4: -# $OpenBSD: PkgAdd.pm,v 1.92 2017/02/27 14:03:52 espie Exp $ +# $OpenBSD: PkgAdd.pm,v 1.93 2017/03/07 14:35:40 espie Exp $ # # Copyright (c) 2003-2014 Marc Espie <espie@openbsd.org> # @@ -855,7 +855,8 @@ sub newer_has_errors if ($handle->has_error) { $state->set_name_from_handle($handle); $state->log("Can't install #1: #2", - $handle->pkgname, $handle->error_message); + $handle->pkgname, $handle->error_message) + unless $handle->has_reported_error; $state->{bad}++; $set->cleanup($handle->has_error); $state->tracker->cant($set); |