diff options
| author | Kris Kennaway <kris@FreeBSD.org> | 2005-01-06 23:07:50 +0000 |
|---|---|---|
| committer | Kris Kennaway <kris@FreeBSD.org> | 2005-01-06 23:07:50 +0000 |
| commit | 0715403560ab0523e9ca33392214c78f49857055 (patch) | |
| tree | eee87c355852052d2238813ac5bc4e0193bf5ed1 | |
| parent | dbfcfd10a4e015cfa4284e34745feb67ad85e0e8 (diff) | |
| download | ports-0715403560ab0523e9ca33392214c78f49857055.tar.gz ports-0715403560ab0523e9ca33392214c78f49857055.zip | |
* Include portbuild.conf before portbuild.${hostname} to reset the default
value of variables
* Allow krion to drink from the email firehose
Approved by: portmgr (self)
Notes
Notes:
svn path=/head/; revision=125737
| -rwxr-xr-x | Tools/portbuild/scripts/pdispatch | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/Tools/portbuild/scripts/pdispatch b/Tools/portbuild/scripts/pdispatch index 56c5743f86f6..d6c6c62ad71e 100755 --- a/Tools/portbuild/scripts/pdispatch +++ b/Tools/portbuild/scripts/pdispatch @@ -76,6 +76,7 @@ while [ -z "${host}" -o -z "${chroot}" ]; do if [ -z "${host}" ]; then sleep 15 else + . ${pb}/${arch}/portbuild.conf test -f ${pb}/${arch}/portbuild.${host} && . ${pb}/${arch}/portbuild.${host} chroot=$(ssh -a -n ${client_user}@${host} ${sudo_cmd} ${pb}/scripts/claim-chroot ${arch} ${branch} ${pkgname}) if [ -z "${chroot}" ]; then @@ -86,6 +87,7 @@ while [ -z "${host}" -o -z "${chroot}" ]; do done echo ${chroot}@${host} +. ${pb}/${arch}/portbuild.conf test -f ${pb}/${arch}/portbuild.${host} && . ${pb}/${arch}/portbuild.${host} echo "dispatching: ssh -a -t -n ${client_user}@${host} ${sudo_cmd} ${command} ${arch} ${branch} ${chroot} ${flags} \"$ED\" \"$PD\" \"$FD\" \"$BD\" \"$RD\" ${args}" @@ -113,20 +115,20 @@ if [ "${error}" = 0 ]; then lockf ${pb}/${arch}/${branch}/failure.lock ${pb}/scripts/buildsuccess ${arch} ${branch} ${pkgname} log=${pb}/${arch}/${branch}/logs/$pkgname.log if grep -q "even though it is marked BROKEN" ${log}; then - echo | mail -s "${pkgname} BROKEN but built on ${arch} ${branch}" kris@FreeBSD.org + echo | mail -s "${pkgname} BROKEN but built on ${arch} ${branch}" kris@FreeBSD.org krion@FreeBSD.org fi if [ "${arch}" = "i386" ]; then if grep -q "^list of .*file" ${log}; then buildlogdir=$(realpath ${pb}/${arch}/${branch}/logs/) baselogdir=$(basename ${buildlogdir}) - (sed -e '/^build started/,$d' $log;echo;echo "For the full build log, see"; echo; echo " http://${master}/errorlogs/${arch}-errorlogs/${baselogdir}/$(basename $log)";echo;sed -e '1,/^=== Checking filesystem state/d' $log) | mail -s "${pkgname} pkg-plist errors on ${arch} ${branch}" kris@FreeBSD.org + (sed -e '/^build started/,$d' $log;echo;echo "For the full build log, see"; echo; echo " http://${master}/errorlogs/${arch}-errorlogs/${baselogdir}/$(basename $log)";echo;sed -e '1,/^=== Checking filesystem state/d' $log) | mail -s "${pkgname} pkg-plist errors on ${arch} ${branch}" kris@FreeBSD.org krion@FreeBSD.org fi fi else log=${pb}/${arch}/${branch}/errors/${pkgname}.log - scp ${client_user}@${host}:${chroot}/tmp/${pkgname}.log ${log} || (echo ${chroot}@${host}; ssh -a -n ${client_user}@${host} ls -laR ${chroot}/tmp) | mail -s "${pkgname} logfile not found" kris@FreeBSD.org + scp ${client_user}@${host}:${chroot}/tmp/${pkgname}.log ${log} || (echo ${chroot}@${host}; ssh -a -n ${client_user}@${host} ls -laR ${chroot}/tmp) | mail -s "${pkgname} logfile not found" kris@FreeBSD.org krion@FreeBSD.org if ! grep -q "even though it is marked BROKEN" ${log}; then - tail -1000 ${log} | mail -s "${pkgname} failed on ${arch} ${branch}" kris@FreeBSD.org + tail -1000 ${log} | mail -s "${pkgname} failed on ${arch} ${branch}" kris@FreeBSD.org krion@FreeBSD.org fi lockf ${pb}/${arch}/${branch}/failure.lock ${pb}/scripts/buildfailure ${arch} ${branch} ${pkgname} fi |