8352b86 Make prompt outputs consistent — HardenedBSD-pkg

rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9

HardenedBSD Package Manager

Make prompt outputs consistent

Bryan Drewery committed 11 years ago

commit 8352b86e4f566e3b19ed7da8ed9599b7c0d30302
parent 36f9f5c

8 files changed +11 -9

modified libpkg/pkg_jobs.c

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

 	while (it != NULL && pkgdb_it_next(it, &p, flags) == EPKG_OK) {
 		pkg_get(p, PKG_UNIQUEID, &fuid);
 		sbuf_printf(qmsg, "%s has no direct installation candidates, change it to "
 				"%s [Y/n]: ", uid, fuid);
 				"%s? [Y/n]: ", uid, fuid);
 		sbuf_finish(qmsg);
 		if (pkg_emit_query_yesno(true, sbuf_data(qmsg))) {
 			/* Change the origin of the local package */

modified libpkg/pkg_solve.c

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

 		do {
 			struct pkg_solve_variable *var = &problem->variables[*failed - 1];
 			sbuf_printf(sb, "cannot %s package %s, remove it from request [Y/n]: ",
 			sbuf_printf(sb, "cannot %s package %s, remove it from request? [Y/n]: ",
 				var->to_install ? "install" : "remove", var->uid);
 			sbuf_finish(sb);

modified src/annotate.c

@@ -131,7 +131,7 @@ do_delete(struct pkgdb *db, struct pkg *pkg, const char *tag)

 	const char	*pkgname, *pkgversion;
 	int		 ret = EPKG_OK;
 	if (query_tty_yesno(false, "%n-%v: Delete annotation tagged: %S "
 	if (query_tty_yesno(false, "%n-%v: Delete annotation tagged: %S? "
 			 "[y/N]: ", pkg, pkg, tag)) {
 		ret = pkgdb_delete_annotation(db, pkg, tag);
 		if (ret == EPKG_OK) {

modified src/check.c

@@ -171,7 +171,7 @@ fix_deps(struct pkgdb *db, struct deps_head *dh, int nbpkgs, bool yes)

 	/* print a summary before applying the jobs */
 	print_jobs_summary(jobs, "The following packages will be installed:\n\n");
 	rc = query_yesno(false, "\n>>> Try to fix the missing dependencies [y/N]: ");
 	rc = query_yesno(false, "\n>>> Try to fix the missing dependencies? [y/N]: ");
 	if (rc) {
 		if (pkgdb_access(PKGDB_MODE_WRITE, PKGDB_DB_LOCAL) ==

modified src/clean.c

@@ -311,7 +311,7 @@ exec_clean(int argc, char **argv)

 	printf("The cleanup will free %s\n", size);
 	if (!dry_run) {
 			if (query_yesno(false,
 			  "\nProceed with cleaning the cache [y/N]: ")) {
 			  "\nProceed with cleaning the cache? [y/N]: ")) {
 				retcode = delete_dellist(&dl);
 			}
 	} else {

modified src/fetch.c

@@ -206,11 +206,12 @@ exec_fetch(int argc, char **argv)

 		rc = print_jobs_summary(jobs, "The following packages will be fetched:\n\n");
 		if (rc != 0)
 			rc = query_yesno(false, "\nProceed with fetching packages [y/N]: ");
 			rc = query_yesno(false, "\nProceed with fetching "
 			    "packages? [y/N]: ");
 		else {
 			printf("No packages are required to be fetched.\n");
 			rc = query_yesno(false, "Check the integrity of packages "
 							"downloaded [y/N]: ");
 							"downloaded? [y/N]: ");
 			csum_only = true;
 		}
 	}

modified src/install.c

@@ -232,7 +232,7 @@ exec_install(int argc, char **argv)

 			if (!dry_run) {
 				rc = query_yesno(false,
 				    "\nProceed with this action [y/N]: ");
 				    "\nProceed with this action? [y/N]: ");
 			}
 			else {
 				rc = false;

modified src/upgrade.c

@@ -186,7 +186,8 @@ exec_upgrade(int argc, char **argv)

 				nbactions, pkg_jobs_total(jobs));
 			if (!dry_run)
 				rc = query_yesno(false, "\nProceed with this action [y/N]: ");
 				rc = query_yesno(false, "\nProceed with this "
 				    "action? [y/N]: ");
 			else
 				rc = false;
 		}