[Libreoffice-commits] .: Branch 'feature/bootstrap-build' - bootstrap.1 download

[Norbert Thiebaud]

 bootstrap.1 |    2 +-
 download    |    5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

New commits:
commit 3690c4bafd2880bed9860595e9e674c2605a6965
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date:   Sun Nov 28 17:45:45 2010 -0600

    fix issues when building with the build-repo

diff --git a/bootstrap.1 b/bootstrap.1
index 156f562..304f41c 100644
--- a/bootstrap.1
+++ b/bootstrap.1
@@ -80,5 +80,5 @@ chmod +x "$SRC_ROOT/solenv/bin/gccinstlib.pl"
 
 # fetch or update external tarballs
 if [ "$DO_FETCH_TARBALLS" = "yes" ]; then
-	$SRC_ROOT/fetch_tarballs.sh $SRC_ROOT/ooo.lst
+	$SRC_ROOT/download $SRC_ROOT/ooo.lst
 fi
diff --git a/download b/download
index 5482ac9..9ab936f 100755
--- a/download
+++ b/download
@@ -26,7 +26,10 @@
 #
 #*************************************************************************
 
-if [ ! -d clone ] ; then
+# we want to clone if we are in the bootstrap git repo and clone does not exist yet
+# we need to test for a .git in order not to clone after rsync if we are called in
+# the inner autogen of the buid-repo based build
+if [ ! -d clone -a -d .git ] ; then
     ./g clone
 fi
 if [ -z "$TARFILE_LOCATION" ]; then