]> git.rm.cloudns.org Git - xonotic/xonotic.git/commitdiff
mirrorselection: handle errors better
authorRudolf Polzer <divverent@alientrap.org>
Sat, 2 Apr 2011 11:02:16 +0000 (13:02 +0200)
committerRudolf Polzer <divVerent@xonotic.org>
Sat, 2 Apr 2011 11:04:16 +0000 (13:04 +0200)
all

diff --git a/all b/all
index ae5a06af094bda70515714d470830472c5e9f097..1685f3620fbcde9ff72c8d0e170021ed3be34e8a 100755 (executable)
--- a/all
+++ b/all
@@ -379,6 +379,7 @@ bestmirror()
        suf=$1; shift
 
        if ! { time -p true; } >/dev/null 2>&1; then
+               msg "Cannot do timing in this shell"
                return 1
        fi
 
@@ -546,7 +547,6 @@ case "$cmd" in
                case "$location" in
                        current)
                                if [ x"`git config xonotic.all.mirrorselection 2>/dev/null || true`" != x"done" ]; then
-                                       git config xonotic.all.mirrorselection done
                                        location=best
                                fi
                                ;;
@@ -564,7 +564,7 @@ case "$cmd" in
                                case "$newbase" in
                                        *\ *)
                                                if location=`bestmirror $newbase"xonotic.git" de us nl:'*6/5'`; then # 20% malus to the NL server to not overload it too much
-                                                       :
+                                                       git config xonotic.all.mirrorselection done
                                                else
                                                        location=current
                                                fi