svn commit: r47266 - head/share/tools

[Glen Barber]

Author: gjb
Date: Tue Aug 18 21:05:16 2015
New Revision: 47266
URL: https://svnweb.freebsd.org/changeset/doc/47266

Log:
  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

Modified:
  head/share/tools/webupdate
  head/share/tools/webupdate.wrapper

Modified: head/share/tools/webupdate
==============================================================================
--- head/share/tools/webupdate	Tue Aug 18 20:36:22 2015	(r47265)
+++ head/share/tools/webupdate	Tue Aug 18 21:05:16 2015	(r47266)
@@ -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.
 #

Modified: head/share/tools/webupdate.wrapper
==============================================================================
--- head/share/tools/webupdate.wrapper	Tue Aug 18 20:36:22 2015	(r47265)
+++ head/share/tools/webupdate.wrapper	Tue Aug 18 21:05:16 2015	(r47266)
@@ -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