summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorespie <espie@openbsd.org>2017-03-07 14:20:01 +0000
committerespie <espie@openbsd.org>2017-03-07 14:20:01 +0000
commitb25de2602ca09cd15a72bd0db90dd1299095e8ed (patch)
treef8af9d00e14006054ac9e5d9bfa60ac1650b2c53
parentmore error streamlining: (diff)
downloadwireguard-openbsd-b25de2602ca09cd15a72bd0db90dd1299095e8ed.tar.xz
wireguard-openbsd-b25de2602ca09cd15a72bd0db90dd1299095e8ed.zip
get rid of redundant "Can't find CONTENTS" if the location already twitted
-rw-r--r--usr.sbin/pkg_add/OpenBSD/Handle.pm5
1 files changed, 3 insertions, 2 deletions
diff --git a/usr.sbin/pkg_add/OpenBSD/Handle.pm b/usr.sbin/pkg_add/OpenBSD/Handle.pm
index 4e1965f62a9..4d8810d4d3f 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.39 2014/02/08 16:11:02 espie Exp $
+# $OpenBSD: Handle.pm,v 1.40 2017/03/07 14:20:01 espie Exp $
#
# Copyright (c) 2007-2009 Marc Espie <espie@openbsd.org>
#
@@ -235,7 +235,8 @@ sub get_plist
}
my $plist = $location->plist;
unless (defined $plist) {
- $state->say("Can't find CONTENTS from #1", $location->url);
+ $state->say("Can't find CONTENTS from #1", $location->url)
+ unless $location->{error_reported};
$location->close_with_client_error;
$location->wipe_info;
$handle->set_error(BAD_PACKAGE);