Check-in [8be0ecb8e6]

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

Overview
Comment:jail/ports -u: Always try upgrading the SVN checkout before updating
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1:8be0ecb8e6f7cffd97a4c487f1f64af67d738e22
User & Date: bdrewery 2013-06-23 11:47:23
Context
2013-06-23
12:02
Fix SVN URL recording for SVN 1.8 compatibility check-in: 0dcba7253b user: bdrewery tags: trunk
11:47
jail/ports -u: Always try upgrading the SVN checkout before updating check-in: 8be0ecb8e6 user: bdrewery tags: trunk
2013-06-19
15:23
HTML: When landing on /latest/, force a redirect to the actual build check-in: dc5a304d31 user: bdrewery tags: trunk
Changes

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

226
227
228
229
230
231
232

233
234
235
236
237
238
239
		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() {







>







226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
		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"