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

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

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