Radish alpha
H
HardenedBSD-pkg
rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9
HardenedBSD Package Manager
Radicle
Git
Commits › fc0e56e
Merge pull request #411 from xzhavilla/master
Baptiste Daroussin committed 13 years ago
commit fc0e56e99c3c97efade3ebde369b937560e90fb8
parent 8cc0311
1 file changed +4 -4
modified libpkg/pkg_manifest.c
@@ -221,12 +221,12 @@ pkg_set_licenselogic_from_node(struct pkg *pkg, yaml_node_t *val,
{

	if (!strcmp(val->data.scalar.value, "single"))

		pkg_set(pkg, PKG_LICENSE_LOGIC, (int64_t) LICENSE_SINGLE);
- 
	else if (!strcmp(val->data.scalar.value, "and") ||
- 
	    !strcmp(val->data.scalar.value, "dual"))
- 
		pkg_set(pkg, PKG_LICENSE_LOGIC, (int64_t)LICENSE_AND);

	else if (!strcmp(val->data.scalar.value, "or") ||
- 
	    !strcmp(val->data.scalar.value, "multi"))
+ 
	    !strcmp(val->data.scalar.value, "dual"))

		pkg_set(pkg, PKG_LICENSE_LOGIC, (int64_t)LICENSE_OR);
+ 
	else if (!strcmp(val->data.scalar.value, "and") ||
+ 
	    !strcmp(val->data.scalar.value, "multi"))
+ 
		pkg_set(pkg, PKG_LICENSE_LOGIC, (int64_t)LICENSE_AND);

	else {

		pkg_emit_error("Unknown license logic: %s",

		    val->data.scalar.value);