Project

General

Profile

« Previous | Next » 

Revision 43f6b081

Added by Renato Botelho over 9 years ago

Clarify what is happening

View differences:

tools/builder_common.sh
2117 2117
		jail_name=$(poudriere_jail_name ${jail_arch})
2118 2118

  
2119 2119
		local _create_or_update="-u"
2120
		local _create_or_update_text="Updating"
2120 2121
		if ! poudriere jail -i -j "${jail_name}" >/dev/null 2>&1; then
2121 2122
			echo ">>> Poudriere jail ${jail_name} not found, creating..." | tee -a ${LOGFILE}
2122 2123
			_create_or_update="-c -v ${FREEBSD_PARENT_BRANCH} -a ${jail_arch} -m svn"
2124
			_create_or_update_text="Creating"
2123 2125
		fi
2124 2126

  
2125 2127
		if [ "${jail_arch}" = "arm.armv6" ]; then
......
2128 2130
			native_xtools=""
2129 2131
		fi
2130 2132

  
2131
		echo -n ">>> Updating jail ${jail_name}, it may take some time... " | tee -a ${LOGFILE}
2133
		echo -n ">>> ${_create_or_update_text} jail ${jail_name}, it may take some time... " | tee -a ${LOGFILE}
2132 2134
		if ! script -aq ${LOGFILE} poudriere jail ${_create_or_update} -j "${jail_name}" -P ${_jail_patch} ${native_xtools} >/dev/null 2>&1; then
2133 2135
			echo "" | tee -a ${LOGFILE}
2134
			echo ">>> ERROR: Error updating jail ${jail_name}, aborting..." | tee -a ${LOGFILE}
2136
			echo ">>> ERROR: Error ${_create_or_update_text} jail ${jail_name}, aborting..." | tee -a ${LOGFILE}
2135 2137
			print_error_pfS
2136 2138
		fi
2137 2139
		echo "Done!" | tee -a ${LOGFILE}

Also available in: Unified diff