From: Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Date: Mon, 26 Nov 2007 15:48:35 +0000 (+0000)
Subject: more verbose - simpler mirror detection - prints warning when using /etc/planetlab... 
X-Git-Tag: 4.2-rc2~453
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=bd4a5ee344092028a9532ae8b4140780196e6e0e;p=build.git

more verbose - simpler mirror detection - prints warning when using /etc/planetlab/plc_config
---

diff --git a/mkfedora b/mkfedora
index e698017f..09fb7cc1 100755
--- a/mkfedora
+++ b/mkfedora
@@ -18,6 +18,8 @@
 
 export PATH=/sbin:/bin:/usr/sbin:/usr/bin
 
+echo "* Entering mkfedora " "$@"
+
 # Verbosity
 verbose=0
 
@@ -52,6 +54,7 @@ exclude_kernel=
 if [ -f /etc/planetlab/plc_config ] ; then
     . /etc/planetlab/plc_config
     if [ -n "$PLC_DEVEL_FEDORA_URL" ] ; then
+	echo "* mkfedora : setting mirrors from /etc/planetlab/config"
 	mirrors=($PLC_DEVEL_FEDORA_URL)
     fi
 fi
@@ -148,18 +151,19 @@ $releasever/$basearch/os
 "
 fi
 
+echo "$0: candidate mirrors"
+for mirror in "${mirrors[@]}" ; do
+    echo "* candidate mirror $mirror"
+done
+baseurl=""
 for mirror in "${mirrors[@]}" ; do
     for attempt in $attempts; do 
-	baseurl=$mirror/$attempt
-	if fetch $baseurl/repodata/repomd.xml >/dev/null ; then
-	    break
+	attempturl=$mirror/$attempt
+	if fetch $attempturl/repodata/repomd.xml >/dev/null ; then
+	    baseurl=$attempturl
+	    break 2
 	fi
-	unset baseurl
     done
-    if [ -n "$baseurl" ] ; then
-	break
-    fi
-    unset baseurl
 done
 
 if [ -z "$baseurl" ] ; then