summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarc Espie <espie@cvs.openbsd.org>2017-03-07 14:20:02 +0000
committerMarc Espie <espie@cvs.openbsd.org>2017-03-07 14:20:02 +0000
commit281caf78239137eaf59e1c9e3ef68ce0a32322cc (patch)
tree72b10ae60105efd224b9029b153f67821cbc9ca4
parent8c5322298169b790e1197c6c6f8236770111d954 (diff)
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);