a smaller malus for the NL server :P

[xonotic/xonotic.git] / all

diff --git a/all b/all
index 23acd27e6276aea3569f3065994638f930bb2a38..ebe505eab9e188f2009ef512602f842291436364 100755 (executable)
--- a/all
+++ b/all
@@ -272,6 +272,7 @@ fix_upstream_rebase()
 
        # one of the two sides of the merge should be remote upstream, or all is fine
        r_r=`git symbolic-ref HEAD`
+       r_r=${r_r#refs/heads/}
        r_rem=`git config "branch.$r_rem.remote" || $ECHO origin`
        r_bra=`git config "branch.$r_bra.merge" || $ECHO "$r_r"`
        if [ x"$r_me" != x"`git rev-parse "$r_rem/$r_bra"`" ]; then
@@ -540,7 +541,7 @@ case "$cmd" in
                                newbase=`$ECHO "$base" | sed "s,://\(.*\.\)\?git.xonotic.org/,:// .git.xonotic.org/,"`
                                case "$newbase" in
                                        *\ *)
-                                               if location=`bestmirror $newbase"xonotic.git" de us nl:'*3/2'`; then # 50% malus to the NL server to not overload it too much
+                                               if location=`bestmirror $newbase"xonotic.git" de us nl:'*6/5'`; then # 20% malus to the NL server to not overload it too much
                                                        :
                                                else
                                                        location=current