X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=build.common;h=ff5c104d769f875d82877560ccb64912202ea54b;hb=61908f1c343871575276cc196ce9cab0b2ffedde;hp=390b6f3420624a8e62b5d40dbb16e7e87caa7091;hpb=267058f3b41b77c23fd316f6f654b82116377bf8;p=build.git

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"