57fdddf Last commit allows to simplify a bit more the code — HardenedBSD-pkg

rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9

HardenedBSD Package Manager

Last commit allows to simplify a bit more the code

Baptiste Daroussin committed 9 years ago

commit 57fdddf08e3369868673742de9be8dcbfd53335f
parent 7f7324d

1 file changed +3 -5

modified libpkg/pkg_add.c

@@ -436,11 +436,9 @@ do_extract_regfile(struct pkg *pkg, struct archive *a, struct archive_entry *ae,

 		return (EPKG_FATAL);
 	}
 	if (pkg->config_files != NULL) {
 		kh_find(pkg_config_files, pkg->config_files, f->path,
 		    f->config);
 	}
 	/* check if this is a config file */
 	kh_find(pkg_config_files, pkg->config_files, f->path,
 	    f->config);
 	if (f->config) {
 		const char *cfdata;
 		bool merge = pkg_object_bool(pkg_config_get("AUTOMERGE"));