From 86d5aa6f7919b1e2e90e87e62e46e75ee8bd5b3c Mon Sep 17 00:00:00 2001 From: Yaroslav Halchenko Date: Tue, 5 Aug 2014 22:05:41 -0400 Subject: [PATCH] BF: Disable logic for demanding netselect (absent on ubuntus) probably we could sophisticate it with all vendor-specific gizmos http://raphaelhertzog.com/2010/09/27/different-dependencies-between-debian-and-ubuntu-but-common-source-package/ but it is just more reasonable to assume that netselect would eventually come back --- debian/control | 2 +- debian/neurodebian-repository.config | 48 ++++++++++++++----------- debian/neurodebian-repository.templates | 4 +-- 3 files changed, 30 insertions(+), 24 deletions(-) diff --git a/debian/control b/debian/control index e52b4f8..74bbc2b 100644 --- a/debian/control +++ b/debian/control @@ -28,7 +28,7 @@ Description: turnkey platform for the neuroscience Package: neurodebian-repository Architecture: all -Pre-depends: python-minimal, netselect, wget +Pre-depends: python-minimal, wget Depends: neurodebian-keyring, ${misc:Depends} Recommends: netselect Description: NeuroDebian APT repository installer 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)) diff --git a/debian/neurodebian-repository.templates b/debian/neurodebian-repository.templates index 5a206a4..eb31072 100644 --- a/debian/neurodebian-repository.templates +++ b/debian/neurodebian-repository.templates @@ -27,8 +27,8 @@ Description: NeuroDebian mirror to use: - origin: original NeuroDebian repository - best: will try to use netselect to select "closest" mirror. Depending on the configuration of the firewall, and actual mirror - setup, might fail to select actually closest one. netselect - must be installed to use this feature. + setup, might fail to select actually closest one. If netselect + is not available, default mirror (possibly 'origin') will be used. Template: neurodebian-repository/flavor -- 2.39.2