ef6da07 Merge branch 'master' of github.com:pkgng/pkgng — HardenedBSD-pkg

rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9

HardenedBSD Package Manager

Merge branch 'master' of github.com:pkgng/pkgng

jlaffaye committed 14 years ago

commit ef6da07afed1d86018e428eebe0adfa2431e0a43
parent e7a2e1e

2 files changed +2 -2

modified libpkg/pkg_create.c

@@ -73,7 +73,7 @@ pkg_create_from_dir(struct pkg *pkg, const char *root, struct packing *pkg_archi

 	while (pkg_files(pkg, &file) == EPKG_OK) {
 		if (root != NULL)
 			snprintf(fpath, sizeof(MAXPATHLEN), "%s%s", root, pkg_file_path(file));
 			snprintf(fpath, MAXPATHLEN, "%s%s", root, pkg_file_path(file));
 		else
 			strlcpy(fpath, pkg_file_path(file), MAXPATHLEN);

modified libpkg/scripts.c

@@ -30,7 +30,7 @@ pkg_script_run(struct pkg *pkg, pkg_script_t type)

 	}
 	if (map[i].a != type)
 		return (pkg_error_set(EPKG_FATAL, "bad type arg (%d)", type));
 		return (ERROR_BAD_ARG("type"));
 	while (pkg_scripts(pkg, &script) == EPKG_OK) {