Radish alpha
H
HardenedBSD-pkg
rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9
HardenedBSD Package Manager
Radicle
Git
Commits › 0b78d4c
Cleanup grammar for conflict message
Bryan Drewery committed 11 years ago
commit 0b78d4c749b36f58cf221ea10e1bd70cd222b16a
parent 4070631
2 files changed +2 -2
modified src/install.c
@@ -229,7 +229,7 @@ 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"
+ 
				printf ("Conflicts with the existing packages have been found.\n"

						"We need to run one more solver iteration to resolve them.\n");

				continue;

			}
modified src/upgrade.c
@@ -182,7 +182,7 @@ 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"
+ 
				printf ("Conflicts with the existing packages have been found.\n"

						"We need to run one more solver iteration to resolve them.\n");

				continue;

			}