From owner-svn-doc-head@freebsd.org Tue Aug 18 21:05:17 2015 Return-Path: Delivered-To: svn-doc-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 475AC9BCB05; Tue, 18 Aug 2015 21:05:17 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 37B781B3C; Tue, 18 Aug 2015 21:05:17 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.70]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t7IL5HXD032721; Tue, 18 Aug 2015 21:05:17 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id t7IL5GWF032719; Tue, 18 Aug 2015 21:05:16 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201508182105.t7IL5GWF032719@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Tue, 18 Aug 2015 21:05:16 +0000 (UTC) To: doc-committers@freebsd.org, svn-doc-all@freebsd.org, svn-doc-head@freebsd.org Subject: svn commit: r47266 - head/share/tools X-SVN-Group: doc-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-doc-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the doc tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 18 Aug 2015 21:05:17 -0000 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