Radish alpha
H
HardenedBSD-pkg
rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9
HardenedBSD Package Manager
Radicle
Git
Commits › 52a696c
Fix mis order which makes pkg-plist parse too early and script created from there overwritten
Baptiste Daroussin committed 6 years ago
commit 52a696ce776b040dca86613042def4df2033350b
parent 2304209
1 file changed +3 -3
modified libpkg/pkg_create.c
@@ -469,9 +469,6 @@ load_metadata(struct pkg *pkg, const char *metadata, const char *plist,
		return (EPKG_FATAL);

	}

	pkg_manifest_keys_free(keys);
- 
	if (plist != NULL && ports_parse_plist(pkg, plist, rootdir) != EPKG_OK) {
- 
		return (EPKG_FATAL);
- 
	}



	if (pkg->desc == NULL)

		pkg_set_from_fileat(fd, pkg, PKG_DESC, "+DESC", false);
@@ -486,6 +483,9 @@ load_metadata(struct pkg *pkg, const char *metadata, const char *plist,
			pkg_addluascript_fileat(fd, pkg, lua_scripts[i]);

	}
+ 
	if (plist != NULL && ports_parse_plist(pkg, plist, rootdir) != EPKG_OK) {
+ 
		return (EPKG_FATAL);
+ 
	}

	close(fd);



	if (pkg->www == NULL) {