Check-in [c61b908704]

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview
Comment:testport: Make errors more clear Reported by: tj@
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1: c61b9087049ad1d9fcba77877e90f1d1442831e7
User & Date: bdrewery 2013-06-01 01:10:00
Context
2013-06-01
23:59
bulk: Jail pkg-repo again. This reverts [c9ef811ac5] We should keep this jailed to avoid pkg(8) and libarchive exploits in case some package has dangerous data in its manifest, etc. check-in: b801cb0d5d user: bdrewery tags: trunk
01:10
testport: Make errors more clear Reported by: tj@ check-in: c61b908704 user: bdrewery tags: trunk
01:08
make_index: Make jail attachment optional so this can be reused outside of poudriere check-in: 41659b4b96 user: bdrewery tags: trunk
Changes

Changes to src/share/poudriere/testport.sh.

172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
	failed_status=$(bget status)
	failed_phase=${failed_status%:*}

	save_wrkdir ${MASTERMNT} "${PKGNAME}" "/usr/ports/${ORIGIN}" "${failed_phase}" || :

	if [ ${INTERACTIVE_MODE} -eq 0 ]; then
		stop_build /usr/ports/${ORIGIN}
		exit 1
	fi
elif [ -f ${MASTERMNT}/usr/ports/${ORIGIN}/.keep ]; then
	save_wrkdir ${MASTERMNT} "${PKGNAME}" "/usr/ports/${ORIGIN}" "noneed" ||:
fi

msg "Installing from package"
injail ${PKG_ADD} /tmp/pkgs/${PKGNAME}.${PKG_EXT}







|







172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
	failed_status=$(bget status)
	failed_phase=${failed_status%:*}

	save_wrkdir ${MASTERMNT} "${PKGNAME}" "/usr/ports/${ORIGIN}" "${failed_phase}" || :

	if [ ${INTERACTIVE_MODE} -eq 0 ]; then
		stop_build /usr/ports/${ORIGIN}
		err 1 "Build failed in phase: ${failed_phase}"
	fi
elif [ -f ${MASTERMNT}/usr/ports/${ORIGIN}/.keep ]; then
	save_wrkdir ${MASTERMNT} "${PKGNAME}" "/usr/ports/${ORIGIN}" "noneed" ||:
fi

msg "Installing from package"
injail ${PKG_ADD} /tmp/pkgs/${PKGNAME}.${PKG_EXT}