Radish alpha
H
HardenedBSD-pkg
rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9
HardenedBSD Package Manager
Radicle
Git
Commits › 8cb2239
Only parse keywords with libucl
Baptiste Daroussin committed 11 years ago
commit 8cb223976e78b98d4df01e73bb29d85f42c7e17b
parent 52aa933
1 file changed +8 -13
modified libpkg/pkg_ports.c
@@ -857,22 +857,17 @@ external_keyword(struct plist *plist, char *keyword, char *line, struct file_att
		    "%s/%s.ucl", keyword_dir, keyword);

	}
- 
	if (eaccess(keyfile_path, R_OK) != 0) {
- 
		if ((o = external_yaml_keyword(keyword)) == NULL)
- 
			return (EPKG_UNKNOWN);
- 
	} else {
- 
		parser = ucl_parser_new(0);
- 
		if (!ucl_parser_add_file(parser, keyfile_path)) {
- 
			pkg_emit_error("cannot parse keyword: %s",
- 
			    ucl_parser_get_error(parser));
- 
			ucl_parser_free(parser);
- 
			return (EPKG_UNKNOWN);
- 
		}
-
- 
		o = ucl_parser_get_object(parser);
+ 
	parser = ucl_parser_new(0);
+ 
	if (!ucl_parser_add_file(parser, keyfile_path)) {
+ 
		pkg_emit_error("cannot parse keyword: %s",
+ 
				ucl_parser_get_error(parser));

		ucl_parser_free(parser);
+ 
		return (EPKG_UNKNOWN);

	}
+ 
	o = ucl_parser_get_object(parser);
+ 
	ucl_parser_free(parser);
+ 


	schema = keyword_open_schema();



	if (schema != NULL) {