diff options
| author | kris <kris@FreeBSD.org> | 2002-03-10 07:14:41 +0800 |
|---|---|---|
| committer | kris <kris@FreeBSD.org> | 2002-03-10 07:14:41 +0800 |
| commit | f389848228e0647e09342066e9025ac9f5bcf91f (patch) | |
| tree | 5fc0cbca67e3a2025f66124a3f2c2099ac12e6e8 | |
| parent | a36eb19b6bcc07d1547cc970ed65eb196d7dda1d (diff) | |
| download | freebsd-ports-graphics-f389848228e0647e09342066e9025ac9f5bcf91f.tar.gz freebsd-ports-graphics-f389848228e0647e09342066e9025ac9f5bcf91f.tar.zst freebsd-ports-graphics-f389848228e0647e09342066e9025ac9f5bcf91f.zip | |
* Use portbuild.conf for config information.
* Shorten timeout period from 12 hours to 4 hours to avoid delaying the builds
unnecessarily.
* Reverse sense of NOPLISTCHECK -> PLISTCHECK, since it's not an option
we want enabled by default (it causes too many build failures). This
was too easy to forget when building packages 'by hand' using the parallel
makefile.
| -rwxr-xr-x | Tools/portbuild/scripts/pdispatch | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/Tools/portbuild/scripts/pdispatch b/Tools/portbuild/scripts/pdispatch index 5dcc0128c71..38ed4ac33bb 100755 --- a/Tools/portbuild/scripts/pdispatch +++ b/Tools/portbuild/scripts/pdispatch @@ -5,8 +5,11 @@ # Choose a random machine from ${buildroot}/ulist and dispatch the # job to it via the ptimeout script. -# wait 12 hours maximum -timeout=43200 +pb=/var/portbuild +. ${pb}/portbuild.conf + +# wait 4 hours maximum +timeout=14400 branch=$1 command=$2 @@ -35,11 +38,12 @@ fi if [ "x$NO_RESTRICTED" != "x" ]; then flags="${flags} -norestr" fi -if [ "x$NOPLISTCHECK" != "x" ]; then - flags="${flags} -noplistcheck" +if [ "x$PLISTCHECK" != "x" ]; then + flags="${flags} -plistcheck" fi if [ "x$NODUMMY" != "x" ]; then flags="${flags} -nodummy" fi + echo "dispatching: ssh -a -t -n $1 ${command} ${branch} $flags $args at $(date)" ${buildroot}/scripts/ptimeout $timeout ssh -a -t -n $1 ${command} ${branch} ${flags} $args |