Radish alpha
H
HardenedBSD-pkg
rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9
HardenedBSD Package Manager
Radicle
Git
Commits › f54c8aa
Merge commit 'ecf659510be5e198dd4d5974c10b6a655353dfcc' into master
Shawn Webb committed 5 years ago
commit f54c8aae68b03a2f0a38390e2f8cf65c0887b7fc
parent 7e2225c
3 files changed +6 -2
modified NEWS
@@ -1,3 +1,7 @@
+ 
Changes from 1.15.99.2 to 1.15.99.3
+ 
- Fix cases where lua scripts are not properly recognized
+ 
- Fix %# in scripts
+ 


Changes from 1.15.99.1 to 1.15.99.2

- Fix '%X' to include the file name and sum
modified libpkg/lua_scripts.c
@@ -122,7 +122,7 @@ lua_pkg_copy(lua_State *L)
	lua_getglobal(L, "package");

	struct pkg *pkg = lua_touserdata(L, -1);
- 
	if (fstatat(pkg->rootfd, RELATIVE_PATH(src), &s1, AT_SYMLINK_NOFOLLOW) == -1) {
+ 
	if (fstatat(pkg->rootfd, RELATIVE_PATH(src), &s1, 0) == -1) {

		lua_pushinteger(L, 2);

		return (1);

	}
modified libpkg/pkg_manifest.c
@@ -605,7 +605,7 @@ pkg_obj(struct pkg *pkg, const ucl_object_t *obj, uint32_t attr)
				break;

			}

			lua_script_type = lua_script_type_str(key);
- 
			if (script_type == PKG_LUA_UNKNOWN) {
+ 
			if (lua_script_type == PKG_LUA_UNKNOWN) {

				pkg_emit_error("Skipping unknown script "

				    "type: %s", key);

				break;