diff options
| author | Glen Barber <gjb@FreeBSD.org> | 2015-08-18 21:05:16 +0000 |
|---|---|---|
| committer | Glen Barber <gjb@FreeBSD.org> | 2015-08-18 21:05:16 +0000 |
| commit | fed721c5897b6128ab9a5e53ed7362822091ae9e (patch) | |
| tree | d3ce59a99f0e54f36fd4f6442dbbfcfc4c6276f4 /share/tools | |
| parent | c67f1a1ff8154993c60904d735a231bba060d328 (diff) | |
Move the ports INDEX fetch functionality from webupdate.wrapper
to webupdate to fix the weekly clean build failures.
When fullbuild-clean.flag exists, all of the trees are removed
and checked out cleanly. This happens after the INDEX-${INDEXNUM}
is fetched, so when the build enters the htdocs/ports/ directory,
the INDEX-${INDEXNUM} no longer exists.
Approved by: doceng (implicit)
Sponsored by: The FreeBSD Foundation
Notes
svn path=/head/; revision=47266
Diffstat (limited to 'share/tools')
| -rwxr-xr-x | share/tools/webupdate | 5 | ||||
| -rwxr-xr-x | share/tools/webupdate.wrapper | 5 |
2 files changed, 5 insertions, 5 deletions
diff --git a/share/tools/webupdate b/share/tools/webupdate index 31de593f0e..96cfb42454 100755 --- a/share/tools/webupdate +++ b/share/tools/webupdate @@ -151,6 +151,11 @@ else #svn update --accept theirs-full relnotes/man4 >> $LOGFILE 2>&1 || exit 2; fi +if [ ! -e "${PINDEX_OVERRIDE}" ]; then + [ -e ${PORTSDIR}/INDEX-${INDEXNUM} ] && rm -f ${PORTSDIR}/INDEX-${INDEXNUM} + make -C ${PORTSDIR} fetchindex +fi + # # Build the web site. # diff --git a/share/tools/webupdate.wrapper b/share/tools/webupdate.wrapper index 413c3f5520..43fb80e414 100755 --- a/share/tools/webupdate.wrapper +++ b/share/tools/webupdate.wrapper @@ -24,11 +24,6 @@ export WEBMAILTO export WITH_PORTS_GROWTH=YES export WITH_PRSTATS=YES -if [ ! -e "${PINDEX_OVERRIDE}" ]; then - [ -e ${PORTSDIR}/INDEX-${INDEXNUM} ] && rm -f ${PORTSDIR}/INDEX-${INDEXNUM} - make -C ${PORTSDIR} fetchindex -fi - # Flags are ordered by more extensive to less if [ -e $FLAGDIR/fullbuild-clean.flag ]; then export BUILD_RELNOTES=YES |