7271818 Cleanup old package only when extraction is ok — HardenedBSD-pkg

HardenedBSD Package Manager

Cleanup old package only when extraction is ok

Baptiste Daroussin committed 10 years ago

commit 7271818d680546a159c6d40708486c4cf32b5529
parent a1d1a35799adb31c4855b416265b3575432e206d

1 file changed +9 -8

modified libpkg/pkg_add.c

@@ -872,14 +872,6 @@ pkg_add_common(struct pkgdb *db, const char *path, unsigned flags,

 	if (retcode != EPKG_OK)
 		goto cleanup;
 	if (local != NULL) {
 		pkg_debug(1, "Cleaning up old version");
 		if (pkg_add_cleanup_old(db, local, pkg, flags) != EPKG_OK) {
 			retcode = EPKG_FATAL;
 			goto cleanup;
 		}
 	}
 	/*
 	 * Execute pre-install scripts
 	 */

@@ -907,6 +899,15 @@ pkg_add_common(struct pkgdb *db, const char *path, unsigned flags,

 		}
 	}
 	if (local != NULL) {
 		pkg_debug(1, "Cleaning up old version");
 		if (pkg_add_cleanup_old(db, local, pkg, flags) != EPKG_OK) {
 			retcode = EPKG_FATAL;
 			goto cleanup;
 		}
 	}
 	/* Update configuration file content with db with newer versions */
 	pkgdb_update_config_file_content(pkg, db->sqlite);