Radish alpha
H
HardenedBSD-pkg
rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9
HardenedBSD Package Manager
Radicle
Git
Commits › bca4f54
pkg-install exits 0 when requested packages are already installed.
Alexandre Perrin committed 13 years ago
commit bca4f54ffed129fae535fc64fb861e983490c651
parent 9d50586
1 file changed +19 -20
modified pkg/install.c
@@ -162,28 +162,27 @@ exec_install(int argc, char **argv)
	if (pkg_jobs_solve(jobs) != EPKG_OK)

		goto cleanup;
- 
	if ((nbactions = pkg_jobs_count(jobs)) == 0)
- 
		goto cleanup;
-
- 
	/* print a summary before applying the jobs */
- 
	if (!quiet || dry_run) {
- 
		print_jobs_summary(jobs,
- 
		    "The following %d packages will be installed:\n\n",
- 
		    nbactions);
-
- 
		if (!yes && !dry_run)
- 
			yes = query_yesno(
- 
			    "\nProceed with installing packages [y/N]: ");
- 
		if (dry_run)
- 
			yes = false;
- 
	}
+ 
	if ((nbactions = pkg_jobs_count(jobs)) > 0) {
+ 
		/* print a summary before applying the jobs */
+ 
		if (!quiet || dry_run) {
+ 
			print_jobs_summary(jobs,
+ 
			    "The following %d packages will be installed:\n\n",
+ 
			    nbactions);
+
+ 
			if (!yes && !dry_run)
+ 
				yes = query_yesno(
+ 
				    "\nProceed with installing packages [y/N]: ");
+ 
			if (dry_run)
+ 
				yes = false;
+ 
		}
- 
	if (yes && pkg_jobs_apply(jobs) != EPKG_OK)
- 
		goto cleanup;
+ 
		if (yes && pkg_jobs_apply(jobs) != EPKG_OK)
+ 
			goto cleanup;
- 
	if (messages != NULL) {
- 
		sbuf_finish(messages);
- 
		printf("%s", sbuf_data(messages));
+ 
		if (messages != NULL) {
+ 
			sbuf_finish(messages);
+ 
			printf("%s", sbuf_data(messages));
+ 
		}

	}



	retcode = EX_OK;