Radish alpha
H
HardenedBSD-pkg
rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9
HardenedBSD Package Manager
Radicle
Git
Commits › 1a32d79
More logical simplification.
Matthew Seaman committed 13 years ago
commit 1a32d794f19557a68fc21da225fa3b01c56b78c6
parent 7b386f7
2 files changed +3 -7
modified pkg/delete.c
@@ -153,10 +153,7 @@ exec_delete(int argc, char **argv)
		if (dry_run)

			yes = false;

	}
- 
	if (yes) {
- 
		if ((retcode = pkg_jobs_apply(jobs)) != EPKG_OK)
- 
			goto cleanup;
- 
	} else
+ 
	if (!yes || (retcode = pkg_jobs_apply(jobs)) != EPKG_OK)

		goto cleanup;



	pkgdb_compact(db);
modified pkg/upgrade.c
@@ -131,9 +131,8 @@ exec_upgrade(int argc, char **argv)
			yes = false;

	}
- 
	if (yes)
- 
		if (pkg_jobs_apply(jobs) != EPKG_OK)
- 
			goto cleanup;
+ 
	if (yes && pkg_jobs_apply(jobs) != EPKG_OK)
+ 
		goto cleanup;



	if (messages != NULL) {

		sbuf_finish(messages);