X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=debian%2Fneurodebian-repository.config;h=0f3776c8a6dd50bbf0465d50301468d10438498b;hb=86d5aa6f7919b1e2e90e87e62e46e75ee8bd5b3c;hp=a40f1533e409cfd6b4510ca49018b4aafeaf7d46;hpb=0c431bd745a42023be92ead25dd0857ed173327a;p=neurodebian.git

diff --git a/debian/neurodebian-repository.config b/debian/neurodebian-repository.config
index a40f153..0f3776c 100755
--- a/debian/neurodebian-repository.config
+++ b/debian/neurodebian-repository.config
@@ -52,27 +52,33 @@ while [ "$STATE" != 0 -a "$STATE" != 8 ]; do
     esac
 
     if db_go; then
-		case $STATE in
-			2)
-				db_metaget neurodebian-repository/mirror value
-				selected_mirror="$RET"
-				# TODOs:
-				# - handle custom
-				# - separate out alias from url
-				debug "selected mirror: $selected_mirror"
-				if [ "$selected_mirror" = "best" ] && ! which netselect &>/dev/null; then
-					if [ "$mirror_selection_ret" = "30 question skipped" ]; then
-						# if the question was not even shown, we would
-						# not get a chance to specify mirror, thus
-						# better just fail altogether and demand intervention
-						db_input high neurodebian-repository/netselect-cannot-be-used
-						exit 1
-					else
-						db_input high neurodebian-repository/netselect-not-found
-						continue;
-					fi
-				fi
-		esac
+# Ubuntus managed to remove netselect "to accompany apt-netselect"
+# https://bugs.launchpad.net/ubuntu/+source/netselect/+bug/337377
+# So for now remove this mandatory demanding of netselect for "best", and
+# rely on logic in nd-aptenable to select default mirror (currently origin)
+# as the 'best'
+#
+#		case $STATE in
+#			2)
+#				db_metaget neurodebian-repository/mirror value
+#				selected_mirror="$RET"
+#				# TODOs:
+#				# - handle custom
+#				# - separate out alias from url
+#				debug "selected mirror: $selected_mirror"
+#				if [ "$selected_mirror" = "best" ] && ! which netselect &>/dev/null; then
+#					if [ "$mirror_selection_ret" = "30 question skipped" ]; then
+#						# if the question was not even shown, we would
+#						# not get a chance to specify mirror, thus
+#						# better just fail altogether and demand intervention
+#						db_input high neurodebian-repository/netselect-cannot-be-used
+#						exit 1
+#					else
+#						db_input high neurodebian-repository/netselect-not-found
+#						continue;
+#					fi
+#				fi
+#		esac
         STATE=$(($STATE + 1))
     else
         STATE=$(($STATE - 1))