diff options
author | Marc Espie <espie@cvs.openbsd.org> | 2014-11-30 15:56:35 +0000 |
---|---|---|
committer | Marc Espie <espie@cvs.openbsd.org> | 2014-11-30 15:56:35 +0000 |
commit | d278dfd3beea4c91daa3087542bd56d0d472ff0e (patch) | |
tree | a08b13ae7ac096b1ef5f13d31e281e3d7dc14014 | |
parent | e3f0271c701f92a842f6bcfc55f5a571097e4f94 (diff) |
interactive/progressmeter clean-up
-rw-r--r-- | usr.sbin/pkg_add/OpenBSD/Dependencies.pm | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/usr.sbin/pkg_add/OpenBSD/Dependencies.pm b/usr.sbin/pkg_add/OpenBSD/Dependencies.pm index 8c23e17c113..062ff005af9 100644 --- a/usr.sbin/pkg_add/OpenBSD/Dependencies.pm +++ b/usr.sbin/pkg_add/OpenBSD/Dependencies.pm @@ -1,5 +1,5 @@ # ex:ts=8 sw=4: -# $OpenBSD: Dependencies.pm,v 1.153 2014/11/30 09:49:48 espie Exp $ +# $OpenBSD: Dependencies.pm,v 1.154 2014/11/30 15:56:34 espie Exp $ # # Copyright (c) 2005-2010 Marc Espie <espie@openbsd.org> # @@ -572,15 +572,12 @@ sub find_dep_in_repositories if (@pkgs == 1) { return $candidates->[0]; } elsif (@pkgs > 1) { - require OpenBSD::Interactive; - # put default first if available @pkgs = ((grep {$_ eq $dep->{def}} @pkgs), (sort (grep {$_ ne $dep->{def}} @pkgs))); - $state->progress->clear; my $good = $state->ask_list( 'Ambiguous: choose dependency for '.$self->{set}->print.': ', - $state->{interactive}, @pkgs); + @pkgs); return $c{$good}; } else { return; |