diff options
| author | Marc Espie <espie@cvs.openbsd.org> | 2009-05-24 11:05:25 +0000 |
|---|---|---|
| committer | Marc Espie <espie@cvs.openbsd.org> | 2009-05-24 11:05:25 +0000 |
| commit | 59378aef88776222d9e89ff84a5b5f42595cc2da (patch) | |
| tree | 2aba3bb241fd22aa28d9417d6fcc7f5972302749 | |
| parent | ba1a36b1ce82f49b6940fda6180eafbc22643c62 (diff) | |
put back the ambiguous message in non-interactive mode
| -rw-r--r-- | usr.sbin/pkg_add/pkg_add | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/usr.sbin/pkg_add/pkg_add b/usr.sbin/pkg_add/pkg_add index 3d89ccb00f8..fc6f6048277 100644 --- a/usr.sbin/pkg_add/pkg_add +++ b/usr.sbin/pkg_add/pkg_add @@ -1,7 +1,7 @@ #! /usr/bin/perl # ex:ts=8 sw=4: -# $OpenBSD: pkg_add,v 1.335 2009/04/20 08:29:02 espie Exp $ +# $OpenBSD: pkg_add,v 1.336 2009/05/24 11:05:24 espie Exp $ # # Copyright (c) 2003-2007 Marc Espie <espie@openbsd.org> # @@ -509,12 +509,18 @@ sub find_truelocations print "Can't resolve $pkgname\n"; $bad = 1; } elsif (@$l > 1) { - my %h = map {($_->name, $_)} @$l; - $h{'<None>'} = undef; - my $result = OpenBSD::Interactive::ask_list("Ambiguous choose package for $pkgname", $state->{interactive}, sort keys %h); - if (defined $h{$result}) { - push(@$new, OpenBSD::UpdateSet->from_location($h{$result})); + my %h = map {($_->name, $_)} @$l; + if ($state->{interactive}) { + $h{'<None>'} = undef; + my $result = OpenBSD::Interactive::ask_list("Ambiguous: choose package for $pkgname", $state->{interactive}, sort keys %h); + if (defined $h{$result}) { + push(@$new, OpenBSD::UpdateSet->from_location($h{$result})); + } else { + $bad = 1; + } } else { + print "Ambiguous: $pkgname could be ", + join(' ', keys %h), "\n"; $bad = 1; } } else { |