Radish alpha
H
HardenedBSD-pkg
rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9
HardenedBSD Package Manager
Radicle
Git
Commits › 46acf27
Only delete files if the extraction has begun
Baptiste Daroussin committed 14 years ago
commit 46acf27a044e4f08ae9ffbcc6e893afd92b4c0e8
parent 7c1ac42
1 file changed +4 -4
modified libpkg/pkg_add.c
@@ -158,8 +158,11 @@ pkg_add(struct pkgdb *db, const char *path, struct pkg **pkg_p)
	/*

	 * Extract the files on disk.

	 */
- 
	if (extract == true && (retcode = do_extract(a, ae)) != EPKG_OK)
+ 
	if (extract == true && (retcode = do_extract(a, ae)) != EPKG_OK) {
+ 
		/* If the add failed, clean up */
+ 
		(void) pkg_delete_files(pkg, 1);

		goto cleanup;
+ 
	}



	/*

	 * Execute post install scripts
@@ -169,9 +172,6 @@ pkg_add(struct pkgdb *db, const char *path, struct pkg **pkg_p)
	cleanup:



	pkgdb_register_finale(db, retcode);
- 
	/* If the add failed, clean up */
- 
	if (retcode != EPKG_OK)
- 
		(void) pkg_delete_files(pkg, 1);



	if (a != NULL)

		archive_read_finish(a);