From: Yaroslav Halchenko <debian@onerussian.com>
Date: Fri, 27 Jun 2014 18:51:38 +0000 (-0400)
Subject: ENH: use -I for netselect where available (ICMP is more likely to be allowed to reach... 
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=155e0b4c8045a03ce3ecfc7d797667018114b323;p=neurodebian.git

ENH: use -I for netselect where available (ICMP is more likely to be allowed to reach than UDP)
---

diff --git a/tools/nd-aptenable b/tools/nd-aptenable
index 2d4c36e..0bf6948 100755
--- a/tools/nd-aptenable
+++ b/tools/nd-aptenable
@@ -236,9 +236,13 @@ netselect_mirror() {
     else
         # squeeze version doesn't have -D yet to force output of the URL not IP, but for our mirrors ATM it shouldn't matter
         netselect_opts="-s 1"
-        if dpkg --compare-versions $(get_package_version netselect) ge 0.3.ds1-17; then
+        netselect_version="$(get_package_version netselect)"
+        if dpkg --compare-versions "$netselect_version" ge 0.3.ds1-17; then
             netselect_opts+=" -D"
         fi
+        if dpkg --compare-versions "$netselect_version" ge 0.3.ds1-15; then
+            netselect_opts+=" -I"
+        fi
         best_mirror=$(get_mirrors | awk '{print $2;}' | eval $ae_sudo xargs netselect $netselect_opts | awk '{print $2;}')
         print_verbose 2 "Best mirror: $best_mirror"
         echo $best_mirror