610c7dd adjust tests to the fact now meta.conf is prefered over meta.txz — HardenedBSD-pkg

modified tests/frontend/autoupgrade.sh

@@ -30,7 +30,8 @@ autoupgrade_body() {

 		-s exit:0 \
 		pkg repo .
 	cat << EOF > repo.conf
 	mkdir repoconf
 	cat << EOF > repoconf/repo.conf
 local: {
 	url: file:///$TMPDIR,
 	enabled: true

@@ -40,7 +41,7 @@ EOF

 	atf_check \
 		-o match:".*New version of pkg detected.*" \
 		-s exit:1 \
 		pkg -o REPOS_DIR="$TMPDIR" -o PKG_CACHEDIR="$TMPDIR" upgrade -n
 		pkg -o REPOS_DIR="$TMPDIR/repoconf" -o PKG_CACHEDIR="$TMPDIR" upgrade -n
 }
 autoupgrade_multirepo_head() {

@@ -85,7 +86,8 @@ autoupgrade_multirepo_body() {

 		-s exit:0 \
 		pkg repo repo2
 	cat << EOF > repo.conf
 	mkdir repoconf
 	cat << EOF > repoconf/repo.conf
 repo1: {
 	url: file:///$TMPDIR/repo1,
 	enabled: true

@@ -96,7 +98,7 @@ repo2: {

 }
 EOF
 	export REPOS_DIR="${TMPDIR}"
 	export REPOS_DIR="${TMPDIR}/repoconf"
 	atf_check \
 		-o ignore \
 		-s exit:0 \

modified tests/frontend/configmerge.sh

@@ -39,9 +39,10 @@ config_body()

 		pkg create -M test.ucl -p plist
 	pkg repo .
 	echo "local: { url: file://${TMPDIR} }" > local.conf
 	mkdir reposconf
 	echo "local: { url: file://${TMPDIR} }" > reposconf/local.conf
 	atf_check \
 		pkg -o REPOS_DIR=${TMPDIR} -r ${TMPDIR}/target upgrade -qy test
 		pkg -o REPOS_DIR=${TMPDIR}/reposconf -r ${TMPDIR}/target upgrade -qy test
 	atf_check \
 		-o inline:"entry 2\naddition\n" \

@@ -76,9 +77,10 @@ config_fileexist_body()

 		pkg create -M test.ucl -p plist
 	pkg repo .
 	echo "local: { url: file://${TMPDIR} }" > local.conf
 	mkdir reposconf
 	echo "local: { url: file://${TMPDIR} }" > reposconf/local.conf
 	atf_check \
 		pkg -o REPOS_DIR=${TMPDIR} -r ${TMPDIR}/target upgrade -qy test
 		pkg -o REPOS_DIR=${TMPDIR}/reposconf -r ${TMPDIR}/target upgrade -qy test
 	test -f ${TMPDIR}/target/${TMPDIR}/a.pkgnew || atf_fail "file overwritten when it should not have"
 }

@@ -97,12 +99,13 @@ config_hardlink_body()

 		-e empty \
 		pkg create -M test.ucl -p plist -r .
 	atf_check -o ignore pkg repo .
 	echo "local: { url: file://${TMPDIR} }" > local.conf
 	mkdir reposconf
 	echo "local: { url: file://${TMPDIR} }" > reposconf/local.conf
 	mkdir ${TMPDIR}/target
 	# Install the pkg
 	atf_check \
 		pkg -o REPOS_DIR=${TMPDIR} -r ${TMPDIR}/target install -qy test
 		pkg -o REPOS_DIR=${TMPDIR}/reposconf -r ${TMPDIR}/target install -qy test
 	rm *.txz
 	# Modify the local config

@@ -120,12 +123,12 @@ config_hardlink_body()

 		-e empty \
 		pkg create -M test.ucl -p plist -r .
 	atf_check -o ignore pkg repo .
 	atf_check -e ignore -o ignore pkg -o REPOS_DIR=${TMPDIR} update -f
 	atf_check -e ignore -o ignore pkg -o REPOS_DIR=${TMPDIR}/reposconf update -f
 	# Upgrade
 	atf_check \
 		-o ignore \
 		pkg -o REPOS_DIR=${TMPDIR} -r ${TMPDIR}/target upgrade -y
 		pkg -o REPOS_DIR=${TMPDIR}/reposconf -r ${TMPDIR}/target upgrade -y
 	atf_check \
 		-o match:"test-1.1*" \

@@ -147,9 +150,10 @@ config_fileexist_notinpkg_body()

 		pkg create -M test.ucl -p plist
 	pkg repo .
 	echo "local: { url: file://${TMPDIR} }" > local.conf
 	mkdir reposconf
 	echo "local: { url: file://${TMPDIR} }" > reposconf/local.conf
 	atf_check \
 		pkg -o REPOS_DIR=${TMPDIR} -r ${TMPDIR}/target install -qy test
 		pkg -o REPOS_DIR=${TMPDIR}/reposconf -r ${TMPDIR}/target install -qy test
 	test -f ${TMPDIR}/target/${TMPDIR}/a.pkgsave || atf_fail "file overwritten when it should not have"
 }

@@ -195,9 +199,10 @@ config_morecomplicated_body()

 		-o ignore \
 		pkg repo .
 	echo "local: { url: file://${TMPDIR} }" > local.conf
 	mkdir reposconf
 	echo "local: { url: file://${TMPDIR} }" > reposconf/local.conf
 	atf_check \
 		pkg -o REPOS_DIR=${TMPDIR} -r ${TMPDIR}/target upgrade -qy test
 		pkg -o REPOS_DIR=${TMPDIR}/reposconf -r ${TMPDIR}/target upgrade -qy test
 	atf_check \
 		-o inline:"entry1\nentry2\nentry3\nentry4\n" \

modified tests/frontend/conflicts-multirepo.sh

@@ -145,12 +145,12 @@ local2: {

 EOF
 OUTPUT="Updating local1 repository catalogue...
 ${JAILED}Fetching meta.txz:  done
 ${JAILED}Fetching meta.conf:  done
 ${JAILED}Fetching packagesite.txz:  done
 Processing entries:  done
 local1 repository update completed. 2 packages processed.
 Updating local2 repository catalogue...
 ${JAILED}Fetching meta.txz:  done
 ${JAILED}Fetching meta.conf:  done
 ${JAILED}Fetching packagesite.txz:  done
 Processing entries:  done
 local2 repository update completed. 2 packages processed.

modified tests/frontend/conflicts.sh

@@ -185,16 +185,17 @@ fileexists_notinpkg_body()

 		pkg create -M test.ucl -p plist
 	pkg repo .
 	echo "local: { url: file://${TMPDIR} }" > local.conf
 	mkdir reposconf
 	echo "local: { url: file://${TMPDIR} }" > reposconf/local.conf
 	atf_check \
 		pkg -o REPOS_DIR=${TMPDIR} -r ${TMPDIR}/target install -qy test
 		pkg -o REPOS_DIR=${TMPDIR}/reposconf -r ${TMPDIR}/target install -qy test
 	test -f ${TMPDIR}/target/${TMPDIR}/a.pkgsave || atf_fail "file not saved when it should have"
 	# Test the nominal situation just in case
 	rm -f ${TMPDIR}/target/${TMPDIR}/a.pkgsave
 	atf_check \
 		pkg -o REPOS_DIR=${TMPDIR} -r ${TMPDIR}/target install -qyf test
 		pkg -o REPOS_DIR=${TMPDIR}/reposconf -r ${TMPDIR}/target install -qyf test
 	test -f ${TMPDIR}/target/${TMPDIR}/a.pkgsave && atf_fail "file saved when it should not have"
 	return 0
 }

@@ -232,7 +233,8 @@ EOF

 		-s exit:0 \
 		pkg repo .
 	cat << EOF >> repo.conf
 	mkdir reposconf
 	cat << EOF >> reposconf/repo.conf
 local: {
 	url: file:///${TMPDIR},
 	enabled: true

@@ -240,7 +242,7 @@ local: {

 EOF
 OUTPUT="Updating local repository catalogue...
 ${JAILED}Fetching meta.txz:  done
 ${JAILED}Fetching meta.conf:  done
 ${JAILED}Fetching packagesite.txz:  done
 Processing entries:  done
 local repository update completed. 1 packages processed.

@@ -267,5 +269,5 @@ ${JAILED}[2/2] Extracting test2-1: done

 	atf_check \
 		-o inline:"${OUTPUT}" \
 		-s exit:0 \
 		pkg -o REPOS_DIR="${TMPDIR}" -o PKG_CACHEDIR="${TMPDIR}" install -y test2-1
 		pkg -o REPOS_DIR="${TMPDIR}/reposconf" -o PKG_CACHEDIR="${TMPDIR}" install -y test2-1
 }

modified tests/frontend/formula.sh

@@ -56,7 +56,7 @@ EOF

 	    pkg repo .
 	OUTPUT="Updating local1 repository catalogue...
 ${JAILED}meta.txz                                 :  done
 ${JAILED}meta.conf                                 :  done
 ${JAILED}packagesite.txz                          :  done
 Processing entries:  done
 local1 repository update completed. 2 packages processed.

modified tests/frontend/install.sh

@@ -39,7 +39,8 @@ metalog_body()

 		-s exit:0 \
 		pkg repo .
 	cat << EOF > repo.conf
 	mkdir reposconf
 	cat << EOF > reposconf/repo.conf
 local: {
 	url: file:///${TMPDIR},
 	enabled: true

@@ -55,7 +56,7 @@ EOF

 	atf_check \
 		-o ignore \
 		-s exit:0 \
 		pkg -o REPOS_DIR="${TMPDIR}" -o METALOG=${TMPDIR}/METALOG -r ${TMPDIR}/root install -y test
 		pkg -o REPOS_DIR="${TMPDIR}/reposconf" -o METALOG=${TMPDIR}/METALOG -r ${TMPDIR}/root install -y test
 	atf_check \
 		-o match:"./testfile1 type=file uname=root gname=wheel mode=640" \

@@ -91,7 +92,8 @@ reinstall_body()

 		-s exit:0 \
 		pkg repo .
 	cat << EOF > repo.conf
 	mkdir reposconf
 	cat << EOF > reposconf/repo.conf
 local: {
 	url: file:///$TMPDIR,
 	enabled: true

@@ -101,7 +103,7 @@ EOF

 	atf_check \
 		-o ignore \
 		-s exit:0 \
 		pkg -o REPOS_DIR="${TMPDIR}" install -y test
 		pkg -o REPOS_DIR="${TMPDIR}/reposconf" install -y test
 }
 pre_script_fail_body()

modified tests/frontend/issue1425.sh

@@ -109,7 +109,8 @@ files: {

 }
 EOF
         cat << EOF > repos.conf
 	mkdir reposconf
         cat << EOF > reposconf/repos.conf
 repoA: {
         url: file://${TMPDIR}/repoA,
         enabled: true

@@ -151,12 +152,12 @@ EOF

                 pkg repo -o ${TMPDIR}/repoB ${TMPDIR}/repoB
 OUTPUT_CASE1="Updating repoA repository catalogue...
 ${JAILED}Fetching meta.txz:  done
 ${JAILED}Fetching meta.conf:  done
 ${JAILED}Fetching packagesite.txz:  done
 Processing entries:  done
 repoA repository update completed. 4 packages processed.
 Updating repoB repository catalogue...
 ${JAILED}Fetching meta.txz:  done
 ${JAILED}Fetching meta.conf:  done
 ${JAILED}Fetching packagesite.txz:  done
 Processing entries:  done
 repoB repository update completed. 4 packages processed.

@@ -184,11 +185,11 @@ ${JAILED}[4/4] Extracting pkgA-1.0: done

         atf_check \
                 -o inline:"${OUTPUT_CASE1}" \
                 -s exit:0 \
                 pkg -o REPOS_DIR="${TMPDIR}" -o PKG_CACHEDIR="${TMPDIR}" install -y pkgA
                 pkg -o REPOS_DIR="${TMPDIR}/reposconf" -o PKG_CACHEDIR="${TMPDIR}" install -y pkgA
 	#rm -f ${TMPDIR}/local.sqlite
         cat << EOF > repos.conf
         cat << EOF > reposconf/repos.conf
 repoA: {
         url: file://${TMPDIR}/repoA,
         enabled: true,

@@ -224,7 +225,7 @@ ${JAILED}[2/2] Extracting pkgA-1.0: done

                 -o inline:"${OUTPUT_CASE2}" \
                 -e empty \
                 -s exit:0 \
                 pkg -o REPOS_DIR="${TMPDIR}" -o PKG_CACHEDIR="${TMPDIR}" upgrade -yf pkgA pkgD
                 pkg -o REPOS_DIR="${TMPDIR}/reposconf" -o PKG_CACHEDIR="${TMPDIR}" upgrade -yf pkgA pkgD
 	rm -f ${TMPDIR}/local.sqlite

@@ -259,5 +260,5 @@ ${JAILED}[4/4] Extracting pkgA-1.0: done

                 -o inline:"${OUTPUT_CASE3}" \
                 -e empty \
                 -s exit:0 \
                 pkg -o REPOS_DIR="${TMPDIR}" -o PKG_CACHEDIR="${TMPDIR}" install -y pkgA
                 pkg -o REPOS_DIR="${TMPDIR}/reposconf" -o PKG_CACHEDIR="${TMPDIR}" install -y pkgA
 }

modified tests/frontend/issue1440.sh

@@ -114,7 +114,8 @@ files: {

 }
 EOF
         cat << EOF > repos.conf
 	mkdir reposconf
         cat << EOF > reposconf/repos.conf
 repoA: {
         url: file://${TMPDIR}/repoA,
         enabled: true

@@ -186,12 +187,12 @@ EOF

 OUTPUT_CASE1="Updating repoA repository catalogue...
 ${JAILED}Fetching meta.txz:  done
 ${JAILED}Fetching meta.conf:  done
 ${JAILED}Fetching packagesite.txz:  done
 Processing entries:  done
 repoA repository update completed. 4 packages processed.
 Updating repoB repository catalogue...
 ${JAILED}Fetching meta.txz:  done
 ${JAILED}Fetching meta.conf:  done
 ${JAILED}Fetching packagesite.txz:  done
 Processing entries:  done
 repoB repository update completed. 4 packages processed.

@@ -219,7 +220,7 @@ ${JAILED}[4/4] Extracting pkgA-1.0: done

         atf_check \
                 -o inline:"${OUTPUT_CASE1}" \
                 -s exit:0 \
                 pkg -o REPOS_DIR="${TMPDIR}" -o PKG_CACHEDIR="${TMPDIR}" install -y pkgA
                 pkg -o REPOS_DIR="${TMPDIR}/reposconf" -o PKG_CACHEDIR="${TMPDIR}" install -y pkgA

@@ -237,6 +238,6 @@ Your packages are up to date.

                 -o inline:"${OUTPUT_CASE2}" \
                 -e empty \
                 -s exit:0 \
                 pkg -o REPOS_DIR="${TMPDIR}" -o PKG_CACHEDIR="${TMPDIR}" upgrade -y
                 pkg -o REPOS_DIR="${TMPDIR}/reposconf" -o PKG_CACHEDIR="${TMPDIR}" upgrade -y
 }

modified tests/frontend/jpeg.sh

@@ -130,7 +130,8 @@ EOF

 	atf_check -o ignore pkg repo .
 	cat << EOF > repo.conf
 	mkdir reposconf
 	cat << EOF > reposconf/repo.conf
 local: {
 	url: file://${TMPDIR}/,
 	enabled: true

@@ -139,5 +140,5 @@ EOF

 	atf_check \
 		-o ignore \
 		-s exit:0 \
 		pkg -o REPOS_DIR="${TMPDIR}" -o PKG_CACHEDIR="${TMPDIR}" upgrade -y
 		pkg -o REPOS_DIR="${TMPDIR}/reposconf" -o PKG_CACHEDIR="${TMPDIR}" upgrade -y
 }

modified tests/frontend/messages.sh

@@ -35,7 +35,8 @@ EOF

 		-o match:"^package being removed.*" \
 		pkg delete -y test
 	cat << EOF > repo1.conf
 	mkdir reposconf
 	cat << EOF > reposconf/repo1.conf
 local1: {
 	url: file://${TMPDIR},
 	enabled: true

@@ -56,7 +57,7 @@ EOF

 	atf_check -o ignore pkg create -M test.ucl
 	atf_check -o ignore pkg repo .
 	atf_check -o match:"^Upgrading from lower than 1.0.*" \
 	    pkg -o REPOS_DIR="${TMPDIR}" -o PKG_CACHEDIR="${TMPDIR}" upgrade -y
 	    pkg -o REPOS_DIR="${TMPDIR}/reposconf" -o PKG_CACHEDIR="${TMPDIR}" upgrade -y
 	atf_check -o ignore pkg delete -y test
 	cat > test2.ucl << EOF

@@ -73,7 +74,7 @@ EOF

 	atf_check -o ignore pkg register -M test2.ucl
 	atf_check \
 		-o match:"^Upgrading from higher than 1.0.*" \
 	    pkg -o REPOS_DIR="${TMPDIR}" -o PKG_CACHEDIR="${TMPDIR}" upgrade -y
 	    pkg -o REPOS_DIR="${TMPDIR}/reposconf" -o PKG_CACHEDIR="${TMPDIR}" upgrade -y
 	atf_check -o ignore pkg delete -y test
 	cat > test2.ucl << EOF

@@ -91,7 +92,7 @@ EOF

 	atf_check \
 		-o match:"^Upgrading from >1.0 < 3.0.*" \
 		-o match:"^Upgrading from higher than 1.0.*" \
 		pkg -o REPOS_DIR="${TMPDIR}" -o PKG_CACHEDIR="${TMPDIR}" upgrade -y
 		pkg -o REPOS_DIR="${TMPDIR}/reposconf" -o PKG_CACHEDIR="${TMPDIR}" upgrade -y
 OUTPUT='test-5.20_3:
 Always:
 Always print

modified tests/frontend/multipleprovider.sh

@@ -86,7 +86,8 @@ EOF

 		-s exit:0 \
 		pkg repo .
 	cat << EOF > repo.conf
 	mkdir reposconf
 	cat << EOF > reposconf/repo.conf
 local: {
 	url: file:///$TMPDIR,
 	enabled: true

@@ -96,6 +97,6 @@ EOF

 	atf_check \
 		-o ignore \
 		-s exit:0 \
 		pkg -o REPOS_DIR="$TMPDIR" -o PKG_CACHEDIR="$TMPDIR" upgrade -y
 		pkg -o REPOS_DIR="$TMPDIR/reposconf" -o PKG_CACHEDIR="$TMPDIR" upgrade -y
 }

modified tests/frontend/packagemerge.sh

@@ -99,7 +99,8 @@ EOF

 		-s exit:0 \
 		pkg repo .
 	cat << EOF > repo.conf
 	mkdir reposconf
 	cat << EOF > reposconf/repo.conf
 local: {
 	url: file:///$TMPDIR,
 	enabled: true

@@ -109,7 +110,7 @@ EOF

 	atf_check \
 		-o ignore \
 		-s exit:0 \
 		pkg -o REPOS_DIR="$TMPDIR" -o PKG_CACHEDIR="$TMPDIR" upgrade -y
 		pkg -o REPOS_DIR="$TMPDIR/reposconf" -o PKG_CACHEDIR="$TMPDIR" upgrade -y
 	test -f file1 || atf_fail "file1 is not present"
 	test -f file2 || atf_fail "file2 is not present"

modified tests/frontend/packagesplit.sh

@@ -77,7 +77,8 @@ EOF

 	    -s exit:0 \
 	    pkg repo .
 	cat << EOF > repo.conf
 	mkdir reposconf
 	cat << EOF > reposconf/repo.conf
 local: {
 	url: file:///$TMPDIR,
 	enabled: true

@@ -86,7 +87,7 @@ EOF

 	atf_check \
 	    -o ignore \
 	    -s exit:0 \
 	    pkg -o REPOS_DIR="$TMPDIR" -o PKG_CACHEDIR="$TMPDIR" upgrade -y
 	    pkg -o REPOS_DIR="$TMPDIR/reposconf" -o PKG_CACHEDIR="$TMPDIR" upgrade -y
 	test -f file1 || atf_fail "file1 is not present"
 }

modified tests/frontend/php-pr.sh

@@ -81,7 +81,8 @@ files: {

 }
 EOF
 	cat << EOF > repo1.conf
 	mkdir reposconf
 	cat << EOF > reposconf/repo1.conf
 local1: {
         url: file://${TMPDIR},
         enabled: true

@@ -105,11 +106,11 @@ EOF

 	atf_check \
 		-o ignore \
 		-s exit:0 \
 		pkg -o REPOS_DIR="${TMPDIR}" -o PKG_CACHEDIR="${TMPDIR}" install -y php53-extensions
 		pkg -o REPOS_DIR="${TMPDIR}/reposconf" -o PKG_CACHEDIR="${TMPDIR}" install -y php53-extensions
 #### NEW
 	rm repo1.conf
 	rm reposconf/repo1.conf
 	rm -f *.ucl
 	rm *.txz

@@ -224,7 +225,8 @@ EOF

 		-s exit:0 \
 		pkg repo .
 	cat << EOF >> repo.conf
 	mkdir reposconf
 	cat << EOF >> reposconf/repo.conf
 local: {
         url: file://${TMPDIR}/,
         enabled: true

@@ -238,7 +240,7 @@ php53-gd-5.3.27

 "
 OUTPUT="Updating local repository catalogue...
 ${JAILED}Fetching meta.txz:  done
 ${JAILED}Fetching meta.conf:  done
 ${JAILED}Fetching packagesite.txz:  done
 Processing entries:  done
 local repository update completed. 4 packages processed.

@@ -264,7 +266,7 @@ Number of packages to be reinstalled: 1

 	atf_check \
 		-o inline:"${OUTPUT}" \
 		-s exit:1 \
 		pkg -o REPOS_DIR="${TMPDIR}" -o PKG_CACHEDIR="${TMPDIR}" install -n php53-fileinfo
 		pkg -o REPOS_DIR="${TMPDIR}/reposconf" -o PKG_CACHEDIR="${TMPDIR}" install -n php53-fileinfo
 OUTPUT="Updating local repository catalogue...

@@ -289,5 +291,5 @@ Number of packages to be reinstalled: 1

 		-o inline:"${OUTPUT}" \
 		-e empty \
 		-s exit:1 \
 		pkg -o REPOS_DIR="${TMPDIR}" -o PKG_CACHEDIR="${TMPDIR}" upgrade -n
 		pkg -o REPOS_DIR="${TMPDIR}/reposconf" -o PKG_CACHEDIR="${TMPDIR}" upgrade -n
 }

modified tests/frontend/requires.sh

@@ -6,7 +6,8 @@ tests_init \

 	requires
 requires_body() {
 	cat << EOF >> repo.conf
 	mkdir reposconf
 	cat << EOF >> reposconf/repo.conf
 local1: {
 	url: file://${TMPDIR},
 	enabled: true

@@ -38,7 +39,7 @@ EOF

 	    pkg repo .
 	OUTPUT="Updating local1 repository catalogue...
 ${JAILED}Fetching meta.txz:  done
 ${JAILED}Fetching meta.conf:  done
 ${JAILED}Fetching packagesite.txz:  done
 Processing entries:  done
 local1 repository update completed. 2 packages processed.

@@ -55,5 +56,5 @@ Number of packages to be installed: 2

 	atf_check \
 	    -o inline:"${OUTPUT}" \
 	    -s exit:1 \
 	    pkg -o REPOS_DIR="${TMPDIR}" install -n b
 	    pkg -o REPOS_DIR="${TMPDIR}/reposconf" install -n b
 }

modified tests/frontend/rubypuppet.sh

@@ -93,7 +93,8 @@ files: {

 }
 EOF
 	cat << EOF > repo1.conf
 	mkdir reposconf
 	cat << EOF > reposconf/repo1.conf
 local1: {
 	url: file://${TMPDIR},
 	enabled: true

@@ -117,10 +118,10 @@ EOF

 	atf_check \
 	    -o ignore \
 	    -s exit:0 \
 	    pkg -o REPOS_DIR="${TMPDIR}" -o PKG_CACHEDIR="${TMPDIR}" install -y puppet
 	    pkg -o REPOS_DIR="${TMPDIR}"/reposconf -o PKG_CACHEDIR="${TMPDIR}" install -y puppet
 #### NEW
 	rm repo1.conf
 	rm reposconf/repo1.conf
 	rm -f *.ucl
 	rm *.txz

@@ -216,7 +217,8 @@ EOF

 	    -s exit:0 \
 	    pkg repo .
 	cat << EOF > repo.conf
 	mkdir reposconf
 	cat << EOF > reposconf/repo.conf
 local: {
 	url: file://${TMPDIR}/,
 	enabled: true

@@ -224,7 +226,7 @@ local: {

 EOF
 	OUTPUT="Updating local repository catalogue...
 ${JAILED}Fetching meta.txz:  done
 ${JAILED}Fetching meta.conf:  done
 ${JAILED}Fetching packagesite.txz:  done
 Processing entries:  done
 local repository update completed. 5 packages processed.

@@ -259,5 +261,5 @@ Number of packages to be reinstalled: 3

 	atf_check \
 	    -o inline:"${OUTPUT}" \
 	    -s exit:1 \
 	    pkg -o REPOS_DIR="${TMPDIR}" -o PKG_CACHEDIR="${TMPDIR}" upgrade -yn
 	    pkg -o REPOS_DIR="${TMPDIR}/reposconf" -o PKG_CACHEDIR="${TMPDIR}" upgrade -yn
 }