From 312891b9135de109b9c414c14c19373290186471 Mon Sep 17 00:00:00 2001 From: mquinson Date: Wed, 23 Dec 2009 16:45:51 +0000 Subject: [PATCH] that's ok to have a failure in that section since we're trying to detect whether svn is working git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@6970 48e7efb5-ca39-0410-a469-dd3cf9ba447f --- buildtools/scripts/simgrid_build.functions | 2 ++ 1 file changed, 2 insertions(+) diff --git a/buildtools/scripts/simgrid_build.functions b/buildtools/scripts/simgrid_build.functions index fd8c719125..22dfd19514 100644 --- a/buildtools/scripts/simgrid_build.functions +++ b/buildtools/scripts/simgrid_build.functions @@ -7,12 +7,14 @@ get_version() { if [ x$version = x ] ; then cd ${SIMGRID_SVN_ROOT} if [ -e .svn ] ; then + set +e svn up 2>/dev/null if [ $? = 0 ] ; then version="simgrid-3.3.4-svn-r"`svnversion` else version="simgrid-3.3.4-svn-r"`head -n 4 .svn/entries |tail -n 1` fi + set -e else if [ -e .git ] ; then version="simgrid-3.3.4-git-r"`git log --oneline -1 | sed 's| .*||'` fi fi -- 2.20.1