2c1f471 Set 'yes' from config file before parsing command line: this better models the heirarchy of which setting overrides which and simplifies the logic — HardenedBSD-pkg

rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9

HardenedBSD Package Manager

Set 'yes' from config file before parsing command line: this better models the heirarchy of which setting overrides which and simplifies the logic

Matthew Seaman committed 13 years ago

commit 2c1f471955a019e26af8fd78ecfc4ebbd17d1381
parent c9011c4

1 file changed +3 -3

modified pkg/upgrade.c

@@ -51,12 +51,14 @@ exec_upgrade(int argc, char **argv)

 	const char *reponame = NULL;
 	int retcode = 1;
 	int ch;
 	bool yes = false;
 	bool yes;
 	bool all = false;
 	bool dry_run = false;
 	bool auto_update = true;
 	nbactions = nbdone = 0;
 	pkg_config_bool(PKG_CONFIG_ASSUME_ALWAYS_YES, &yes);
 	while ((ch = getopt(argc, argv, "fLnqr:y")) != -1) {
 		switch (ch) {
 		case 'f':

@@ -131,8 +133,6 @@ exec_upgrade(int argc, char **argv)

 	if (!quiet || dry_run) {
 		print_jobs_summary(jobs, PKG_JOBS_INSTALL, "The following %d packages will be upgraded:\n\n", nbactions);
 		if (!yes)
 			pkg_config_bool(PKG_CONFIG_ASSUME_ALWAYS_YES, &yes);
 		if (!yes && !dry_run)
 			yes = query_yesno("\nProceed with upgrading packages [y/N]: ");
 		if (dry_run)