Author: stsp Date: Tue Oct 20 21:03:01 2020 New Revision: 1882715 URL: http://svn.apache.org/viewvc?rev=1882715&view=rev Log: * tools/buildbot/slaves/bb-openbsd/svnclean.sh: Only run 'svn info' if a working copy already exists. Should fix spurious failed builds such as this one: https://ci.apache.org/builders/svn-bb-openbsd/builds/580
Modified: subversion/trunk/tools/buildbot/slaves/bb-openbsd/svnclean.sh Modified: subversion/trunk/tools/buildbot/slaves/bb-openbsd/svnclean.sh URL: http://svn.apache.org/viewvc/subversion/trunk/tools/buildbot/slaves/bb-openbsd/svnclean.sh?rev=1882715&r1=1882714&r2=1882715&view=diff ============================================================================== --- subversion/trunk/tools/buildbot/slaves/bb-openbsd/svnclean.sh (original) +++ subversion/trunk/tools/buildbot/slaves/bb-openbsd/svnclean.sh Tue Oct 20 21:03:01 2020 @@ -34,12 +34,16 @@ svn cleanup ../../unix-build svn update ../../unix-build newlastchangedrev="$(svn info --show-item=last-changed-revision ../../unix-build/Makefile.svn)" (test -h ../GNUmakefile || ln -s ../unix-build/Makefile.svn ../GNUmakefile) -# always rebuild svn, but only rebuild dependencies if Makefile.svn has changed -url="$(svn info --show-item url)" -branch="${url##*/}" -if [ "$lastchangedrev" != "$newlastchangedrev" ]; then - (cd .. && gmake BRANCH="$branch" reset clean) +if [ -d .svn ]; then + # always rebuild svn, but only rebuild deps if Makefile.svn has changed + url="$(svn info --show-item url)" + branch="${url##*/}" + if [ "$lastchangedrev" != "$newlastchangedrev" ]; then + (cd .. && gmake BRANCH="$branch" reset clean) + else + (cd .. && gmake BRANCH="$branch" svn-reset svn-bindings-reset svn-clean) + fi else - (cd .. && gmake BRANCH="$branch" svn-reset svn-bindings-reset svn-clean) + (cd .. && gmake reset clean) fi rm -f tests.log* fails.log*