Check-in [97b3f76e8f]

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

Overview
Comment:MFT: jail/ports -u: Always try upgrading the SVN checkout before updating
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | 3.0.x
Files: files | file ages | folders
SHA1: 97b3f76e8fed96c33dbcd10273ba3ec17dd0d1b6
User & Date: bdrewery 2013-06-23 12:04:21
Context
2013-06-25
20:57
MFT: If host is recent current and building stable/9 or stable/8 then use fmake to build Leaf check-in: d6cf525111 user: bdrewery tags: 3.0.x
2013-06-23
12:04
MFT: jail/ports -u: Always try upgrading the SVN checkout before updating check-in: 97b3f76e8f user: bdrewery tags: 3.0.x
12:03
MFT: parallel_exec: Fix to not disable 'set -e' in child cmd due to || This set -e juggling is to keep this function portable to other scripts that may or may not be running set -e. This fixes compute_deps() finding invalid port origins and not properly stopping before the build starts, which can lead to infinite loops check-in: 0960f3ab3b user: bdrewery tags: 3.0.x
Changes

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

216
217
218
219
220
221
222

223
224
225
226
227
228
229
		if [ -n "${SRCPATCHFILE}" ]; then
			msg_n "Patching the sources with ${SRCPATCHFILE}"
			svn -q patch ${SRCPATCHFILE} ${JAILMNT}/usr/src || err 1 " fail"
			echo done
		fi
	else
		msg_n "Updating the sources from svn..."

		svn -q update ${JAILMNT}/usr/src || err 1 " fail"
		echo " done"
	fi
	build_and_install_world
}

install_from_csup() {







>







216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
		if [ -n "${SRCPATCHFILE}" ]; then
			msg_n "Patching the sources with ${SRCPATCHFILE}"
			svn -q patch ${SRCPATCHFILE} ${JAILMNT}/usr/src || err 1 " fail"
			echo done
		fi
	else
		msg_n "Updating the sources from svn..."
		svn upgrade ${JAILMNT}/usr/src 2>/dev/null || :
		svn -q update ${JAILMNT}/usr/src || err 1 " fail"
		echo " done"
	fi
	build_and_install_world
}

install_from_csup() {

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

227
228
229
230
231
232
233

234
235
236
237
238
239
240
			SNAPDIR=${PTMNT}/.snap
		fi
		/usr/sbin/portsnap -d ${SNAPDIR} -p ${PORTSMNT:-${PTMNT}} ${PSCOMMAND} alfred
		;;
	svn*)
		msg_n "Updating the ports tree..."
		[ ${VERBOSE} -gt 0 ] || quiet="-q"

		svn ${quiet} update ${PORTSMNT:-${PTMNT}}
		echo " done"
		;;
	git)
		msg "Pulling from ${GIT_URL}"
		cd ${PORTSMNT:-${PTMNT}} && git pull
		echo " done"







>







227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
			SNAPDIR=${PTMNT}/.snap
		fi
		/usr/sbin/portsnap -d ${SNAPDIR} -p ${PORTSMNT:-${PTMNT}} ${PSCOMMAND} alfred
		;;
	svn*)
		msg_n "Updating the ports tree..."
		[ ${VERBOSE} -gt 0 ] || quiet="-q"
		svn upgrade ${PORTSMNT:-${PTMNT}} 2>/dev/null || :
		svn ${quiet} update ${PORTSMNT:-${PTMNT}}
		echo " done"
		;;
	git)
		msg "Pulling from ${GIT_URL}"
		cd ${PORTSMNT:-${PTMNT}} && git pull
		echo " done"