00bd664 Extract mtree and execute script when staging — HardenedBSD-pkg

rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9

HardenedBSD Package Manager

Extract mtree and execute script when staging

Baptiste Daroussin committed 12 years ago

commit 00bd6647a12d868d43b3b7925f5178f180981991
parent f17c21c

1 file changed +14 -0

modified libpkg/pkg.c

@@ -1256,6 +1256,18 @@ pkg_copy_tree(struct pkg *pkg, const char *src, const char *dest)

 	struct pkg_dir *dir = NULL;
 	char spath[MAXPATHLEN + 1];
 	char dpath[MAXPATHLEN + 1];
 	bool disable_mtree;
 	const char *prefix;
 	char *mtree;
 	pkg_config_bool(PKG_CONFIG_DISABLE_MTREE, &disable_mtree);
 	if (!disable_mtree) {
 		pkg_get(pkg, PKG_PREFIX, &prefix, PKG_MTREE, &mtree);
 		do_extract_mtree(mtree, prefix);
 	}
 	/* Execute pre-install scripts */
 	pkg_script_run(pkg, PKG_SCRIPT_PRE_INSTALL);
 	if (packing_init(&pack, dest, 0) != EPKG_OK) {
 		/* TODO */

@@ -1274,6 +1286,8 @@ pkg_copy_tree(struct pkg *pkg, const char *src, const char *dest)

 		packing_append_file(pack, spath, dpath);
 	}
 	/* Execute post-install scripts */
 	pkg_script_run(pkg, PKG_SCRIPT_POST_INSTALL);
 	return (packing_finish(pack));
 }