Skip to content

Commit

Permalink
Move the ports INDEX fetch functionality from webupdate.wrapper
Browse files Browse the repository at this point in the history
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
  • Loading branch information
gjb authored and gjb committed Aug 18, 2015
1 parent 0b97819 commit b789b68
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
5 changes: 5 additions & 0 deletions share/tools/webupdate
Original file line number Diff line number Diff line change
Expand Up @@ -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.
#
Expand Down
5 changes: 0 additions & 5 deletions share/tools/webupdate.wrapper
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit b789b68

Please sign in to comment.