Radish alpha
H
HardenedBSD-pkg
rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9
HardenedBSD Package Manager
Radicle
Git
Commits › dcc0b1a
Cleanup grammar for conflict message and respect style(9)
Bryan Drewery committed 11 years ago
commit dcc0b1acc1e81c9bf3ad5221d942ae8e1660ff7d
parent 0b78d4c
2 files changed +6 -4
modified src/install.c
@@ -229,8 +229,9 @@ exec_install(int argc, char **argv)
		if (yes) {

			retcode = pkg_jobs_apply(jobs);

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

				continue;

			}

			else if (retcode != EPKG_OK)
modified src/upgrade.c
@@ -182,8 +182,9 @@ exec_upgrade(int argc, char **argv)
			retcode = pkg_jobs_apply(jobs);

			done = 1;

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

				continue;

			}

			else if (retcode != EPKG_OK)