Radish alpha
H
HardenedBSD-pkg
rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9
HardenedBSD Package Manager
Radicle
Git
Commits › b69e254
Improve output in `upgrade` and `install`.
Vsevolod Stakhov committed 12 years ago
commit b69e254b9ebe0636af851ce8e5a688f3909914cd
parent 06058f6
3 files changed +6 -4
modified libpkg/pkg_jobs.c
@@ -2067,8 +2067,6 @@ pkg_jobs_apply(struct pkg_jobs *j)
					if (j->conflicts_registered == 0)

						pkg_jobs_set_priorities(j);
- 
					pkg_emit_notice("The conflicts with the existing packages have been found.\n"
- 
							"We need to run one more solver iteration to resolve them");

					return (EPKG_CONFLICT);

				}

			}
modified src/install.c
@@ -208,7 +208,7 @@ exec_install(int argc, char **argv)
		yes = yes_arg;

		if (!quiet || dry_run) {

			print_jobs_summary(jobs,
- 
			    "The following %d packages will be affected (of %d in the universe):\n\n",
+ 
			    "The following %d packages will be affected (of %d checked):\n\n",

			    nbactions, pkg_jobs_total(jobs));



			if (!yes && !dry_run)
@@ -221,6 +221,8 @@ exec_install(int argc, char **argv)
		if (yes) {

			retcode = pkg_jobs_apply(jobs);

			if (retcode == EPKG_CONFLICT) {
+ 
				printf ("The conflicts with the existing packages have been found.\n"
+ 
						"We need to run one more solver iteration to resolve them.\n");

				continue;

			}

			else if (retcode != EPKG_OK)
modified src/upgrade.c
@@ -157,7 +157,7 @@ exec_upgrade(int argc, char **argv)
		yes = yes_arg;

		if (!quiet || dry_run) {

			print_jobs_summary(jobs,
- 
				"The following %d packages will be affected (of %d in the universe):\n\n",
+ 
				"The following %d packages will be affected (of %d checked):\n\n",

				nbactions, pkg_jobs_total(jobs));



			if (!yes && !dry_run)
@@ -170,6 +170,8 @@ exec_upgrade(int argc, char **argv)
			retcode = pkg_jobs_apply(jobs);

			done = 1;

			if (retcode == EPKG_CONFLICT) {
+ 
				printf ("The conflicts with the existing packages have been found.\n"
+ 
						"We need to run one more solver iteration to resolve them.\n");

				continue;

			}

			else if (retcode != EPKG_OK)