If pkg_add asks for a dependency immediately the "No change in quirks"
text isn't cleared, and the "Ambiguous..." message prints on the same 
line.


Before:

$ pkg_add git
quirks-2.26 signed on 2014-10-23T16:24:44Z
|No change in quirks-2.26Ambiguous: choose dependency for git-2.1.2:
  a       0: rsync-3.1.1
          1: rsync-3.1.1-iconv



After:

$ pkg_add git
quirks-2.26 signed on 2014-10-23T16:24:44Z
Ambiguous: choose dependency for git-2.1.2:
  a       0: rsync-3.1.1
          1: rsync-3.1.1-iconv




Index: usr.sbin/pkg_add/OpenBSD/Dependencies.pm
===================================================================
RCS file: /cvs/src/usr.sbin/pkg_add/OpenBSD/Dependencies.pm,v
retrieving revision 1.152
diff -u -p -u -r1.152 Dependencies.pm
--- usr.sbin/pkg_add/OpenBSD/Dependencies.pm    1 Feb 2014 11:37:58 -0000       
1.152
+++ usr.sbin/pkg_add/OpenBSD/Dependencies.pm    24 Oct 2014 11:21:47 -0000
@@ -577,6 +577,7 @@ sub find_dep_in_repositories
                # 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);


Reply via email to