078aab7 Switch to new_manifest() — HardenedBSD-pkg

rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9

HardenedBSD Package Manager

Switch to new_manifest()

Brad Davis committed 8 years ago

commit 078aab7f503da38a45541872bb4a23737dfb7ba4
parent 7dc4b7c

1 file changed +10 -32

modified tests/frontend/conflicts.sh

@@ -7,52 +7,30 @@ tests_init \

 find_conflicts_body() {
 	touch a
 	cat << EOF >> manifest
 name: test
 origin: test
 version: 1
 maintainer: test
 categories: [test]
 comment: a test
 www: http://test
 prefix: /
 abi = "*";
 desc: <<EOD
 Yet another test
 EOD
 	atf_check -s exit:0 ${RESOURCEDIR}/test_subr.sh new_manifest test 1 /
 	cat << EOF >> +MANIFEST
 files: {
 	${TMPDIR}/a: "",
 }
 EOF
 	atf_check \
 		-o match:".*Installing.*\.\.\.$" \
 		-e empty \
 		-s exit:0 \
 		pkg register -M +MANIFEST
 	cat << EOF >> manifest2
 name: test2
 origin: test
 version: 1
 maintainer: test
 categories: [test]
 comment: a test
 www: http://test
 prefix: /
 abi = "*";
 desc: <<EOD
 Yet another test
 EOD
 	atf_check -s exit:0 ${RESOURCEDIR}/test_subr.sh new_manifest test2 1 /
 	cat << EOF >> +MANIFEST
 files: {
 	${TMPDIR}/a: "",
 }
 EOF
 	atf_check \
 		-o match:".*Installing.*\.\.\.$" \
 		-e empty \
 		-s exit:0 \
 		pkg register -M manifest
 	atf_check \
 		-o empty \
 		-e empty \
 		-s exit:0 \
 		pkg create -M manifest2 -o .
 		pkg create -M +MANIFEST -o .
 	atf_check \
 		-o inline:"Creating repository in .:  done\nPacking files for repository:  done\n" \