c14e07d create: tell the user which manifest failed being parsed — HardenedBSD-pkg

rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9

HardenedBSD Package Manager

create: tell the user which manifest failed being parsed

Baptiste Daroussin committed 11 months ago

commit c14e07db423d191bdeabc749f1609e231595e308
parent 2db1f60

2 files changed +2 -1

modified libpkg/pkg_create.c

@@ -500,6 +500,7 @@ load_metadata(struct pkg *pkg, const char *metadata, const char *plist,

 	}
 	if ((pkg_parse_manifest_fileat(fd, pkg, "+MANIFEST")) != EPKG_OK) {
 		pkg_emit_error("Error parsing %s/+MANIFEST", metadata);
 		close(fd);
 		return (EPKG_FATAL);
 	}

modified tests/frontend/pkg.sh

@@ -71,7 +71,7 @@ files:

 EOF
 	atf_check \
 	    -o empty \
 	    -e inline:"${PROGNAME}: Bad format in manifest for key: files\n" \
 	    -e inline:"${PROGNAME}: Bad format in manifest for key: files\n${PROGNAME}: Error parsing testpkg/.metadir/+MANIFEST\n" \
 	    -s exit:1 \
 	    pkg create -q -m testpkg/.metadir -r testpkg
 }