summaryrefslogtreecommitdiff
path: root/usr.sbin/pkg_add
diff options
context:
space:
mode:
authorMarc Espie <espie@cvs.openbsd.org>2014-06-12 09:50:06 +0000
committerMarc Espie <espie@cvs.openbsd.org>2014-06-12 09:50:06 +0000
commitfa60daa1a5ca3702d28d560d2f99bc933a361b4e (patch)
tree8f52be8540c647b14ab169ddc094ad2a7171faf7 /usr.sbin/pkg_add
parentee5e3751a9d414ba13d69eced330774d170a8e91 (diff)
display full url if we can for UNSIGNED PACKAGES.
unconfuse mikeb@ :)
Diffstat (limited to 'usr.sbin/pkg_add')
-rw-r--r--usr.sbin/pkg_add/OpenBSD/PkgAdd.pm12
1 files changed, 9 insertions, 3 deletions
diff --git a/usr.sbin/pkg_add/OpenBSD/PkgAdd.pm b/usr.sbin/pkg_add/OpenBSD/PkgAdd.pm
index 45f227e0676..2159470322b 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.65 2014/05/05 16:29:32 espie Exp $
+# $OpenBSD: PkgAdd.pm,v 1.66 2014/06/12 09:50:05 espie Exp $
#
# Copyright (c) 2003-2014 Marc Espie <espie@openbsd.org>
#
@@ -667,13 +667,19 @@ sub check_digital_signature
$state->{packages_without_sig}{$pkgname} = 1;
return if $state->defines('unsigned');
my $okay = 0;
+ my $url;
+ if (defined $handle->location) {
+ $url = $handle->location->url;
+ } else {
+ $url = $pkgname;
+ }
if ($state->{interactive}) {
$state->errprint('UNSIGNED PACKAGE #1: ',
- $pkgname);
+ $url);
$okay = $state->confirm("install anyway", 0);
}
if (!$okay) {
- $state->fatal("Unsigned package #1", $pkgname);
+ $state->fatal("Unsigned package #1", $url);
}
}
}