Radish alpha
H
HardenedBSD-pkg
rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9
HardenedBSD Package Manager
Radicle
Git
Commits › 5aa0d1b
Return an error if one refuse an operation (#1470)
Baptiste Daroussin committed 9 years ago
commit 5aa0d1b8b398e616ec22eb33b25c3f14a9ce2041
parent 91fa14e
4 files changed +16 -3
modified src/autoremove.c
@@ -143,6 +143,9 @@ exec_autoremove(int argc, char **argv)
		goto cleanup;

	}
+ 
	if (!yes && !rc)
+ 
		retcode = EXIT_FAILURE;
+ 


	pkgdb_compact(db);



cleanup:
modified src/delete.c
@@ -228,7 +228,10 @@ exec_delete(int argc, char **argv)
	}

	pkgdb_compact(db);
- 
	retcode = EX_OK;
+ 
	if (rc)
+ 
		retcode = EX_OK;
+ 
	else
+ 
		retcode = EXIT_FAILURE;



cleanup:

	pkgdb_release_lock(db, lock_type);
modified src/install.c
@@ -250,6 +250,7 @@ exec_install(int argc, char **argv)
			}

			else if (retcode != EPKG_OK)

				goto cleanup;
+ 
		} else {

		}



		if (messages != NULL) {
@@ -261,7 +262,10 @@ exec_install(int argc, char **argv)
	if (done == 0 && rc)

		printf("The most recent version of packages are already installed\n");
- 
	retcode = EX_OK;
+ 
	if (rc)
+ 
		retcode = EX_OK;
+ 
	else
+ 
		retcode = EXIT_FAILURE;



cleanup:

	pkgdb_release_lock(db, lock_type);
modified src/upgrade.c
@@ -216,7 +216,10 @@ exec_upgrade(int argc, char **argv)
	if (done == 0 && rc && !quiet)

		printf("Your packages are up to date.\n");
- 
	retcode = EX_OK;
+ 
	if (rc)
+ 
		retcode = EX_OK;
+ 
	else
+ 
		retcode = EXIT_FAILURE;



cleanup:

	pkg_jobs_free(jobs);