summaryrefslogtreecommitdiffstats
path: root/usr.sbin/pkg_add
diff options
context:
space:
mode:
authorespie <espie@openbsd.org>2020-02-19 10:53:53 +0000
committerespie <espie@openbsd.org>2020-02-19 10:53:53 +0000
commit3117a295e28bfc0192974c682c54d456db372dc8 (patch)
treebce09799a62172a2b6dfebeb067c80896b49ba45 /usr.sbin/pkg_add
parentDon't put the userinfo in request URI. This also makes accessing a (diff)
downloadwireguard-openbsd-3117a295e28bfc0192974c682c54d456db372dc8.tar.xz
wireguard-openbsd-3117a295e28bfc0192974c682c54d456db372dc8.zip
Separate singular and plural
Diffstat (limited to 'usr.sbin/pkg_add')
-rw-r--r--usr.sbin/pkg_add/OpenBSD/ForwardDependencies.pm13
1 files changed, 9 insertions, 4 deletions
diff --git a/usr.sbin/pkg_add/OpenBSD/ForwardDependencies.pm b/usr.sbin/pkg_add/OpenBSD/ForwardDependencies.pm
index d568ec49ea0..ca8f7010239 100644
--- a/usr.sbin/pkg_add/OpenBSD/ForwardDependencies.pm
+++ b/usr.sbin/pkg_add/OpenBSD/ForwardDependencies.pm
@@ -1,5 +1,5 @@
# ex:ts=8 sw=4:
-# $OpenBSD: ForwardDependencies.pm,v 1.15 2018/12/17 13:51:21 espie Exp $
+# $OpenBSD: ForwardDependencies.pm,v 1.16 2020/02/19 10:53:53 espie Exp $
#
# Copyright (c) 2009 Marc Espie <espie@openbsd.org>
#
@@ -77,9 +77,14 @@ sub dump
my ($self, $result, $state) = @_;
$state->say("#1 forward dependencies:", $self->{set}->print);
while (my ($pkg, $l) = each %$result) {
- my $deps = join(',', map {$_->{pattern}} @$l);
- $state->say("| Dependencies of #1 on #2 don't match",
- $pkg, $deps);
+ if (@$l == 1) {
+ $state->say("| Dependency of #1 on #2 doesn't match",
+ $pkg, $l->[0]{pattern});
+ } else {
+ my $deps = join(',', map {$_->{pattern}} @$l);
+ $state->say("| Dependencies of #1 on #2 don't match",
+ $pkg, $deps);
+ }
}
}