From a7aa0edcc03bc01180d765906a5416e29f6524eb Mon Sep 17 00:00:00 2001
From: Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Date: Thu, 27 May 2010 17:23:38 +0200
Subject: [PATCH] missing tweak for git-based remote pldistros

---
 build.common | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/build.common b/build.common
index 390b6f34..ff5c104d 100644
--- a/build.common
+++ b/build.common
@@ -579,10 +579,13 @@ function pl_locateDistroFile () {
     pkgsfile=$1; shift
 
     pkgspath=""
-    # if config dir is missing but a .svnpath exists
-    if [[ -f "$builddir/config.${pldistro}.svnpath" && ! -d "$builddir/config.${pldistro}" ]] ; then
-	echo 1>&2 "Invoking make to extract remote config.${pldistro}"
-	make 1>&2 --silent --no-print-directory -C $builddir stage1=true config.${pldistro}
+    # if config dir is missing but a .svnpath or a .gitpath exists, use it to extract the config dir
+    configdir="$builddir/config.${pldistro}"
+    if [ ! -d $configdir ] ; then
+	if [ -f "${configdir}.svnpath" -o -f "${configdir}.gitpath" ] ; then
+	    echo 1>&2 "Invoking make to extract remote config.${pldistro}"
+	    make 1>&2 --silent --no-print-directory -C $builddir stage1=true config.${pldistro}
+	fi
     fi
     # locate it
     paths="$builddir/config.$pldistro/$pkgsfile $builddir/config.planetlab/$pkgsfile"
-- 
2.43.0