9118f6c prevent double output for yes/no — HardenedBSD-pkg

rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9

HardenedBSD Package Manager

prevent double output for yes/no

Andrej Zverev committed 11 years ago

commit 9118f6c23ca82c202e797c8fd7cbfb1105f80a96
parent be40cb9

2 files changed +2 -2

modified libpkg/pkg_jobs.c

@@ -806,7 +806,7 @@ pkg_jobs_try_remote_candidate(struct pkg_jobs *j, const char *pattern,

 		}
 		sbuf_printf(qmsg, "%s has no direct installation candidates, change it to "
 				"%s? [Y/n]: ", uid, p->uid);
 				"%s? ", uid, p->uid);
 		sbuf_finish(qmsg);
 		if (pkg_emit_query_yesno(true, sbuf_data(qmsg))) {
 			/* Change the origin of the local package */

modified libpkg/pkg_solve.c

@@ -856,7 +856,7 @@ pkg_solve_sat_problem(struct pkg_solve_problem *problem)

 				}
 			}
 			sbuf_printf(sb, "cannot %s package %s, remove it from request? [Y/n]: ",
 			sbuf_printf(sb, "cannot %s package %s, remove it from request? ",
 				var->to_install ? "install" : "remove", var->uid);
 			sbuf_finish(sb);