BF: actually we need to aim for multiverse (not restricted) on ubuntus to decide...

diff --git a/debian/neurodebian-repository.templates b/debian/neurodebian-repository.templates
index eb31072b7dbb35270be91cd473dc1eb5de4a02df..d2896c8c66e437caa3eccda93f449d8f71a8b6bd 100644 (file)
--- a/debian/neurodebian-repository.templates
+++ b/debian/neurodebian-repository.templates
@@ -45,8 +45,8 @@ Description: NeuroDebian flavor to use:
     all three areas (main, contrib, non-free)
   auto
     determine which flavor to choose based on current output of
-    apt-cache policy ('full' -- if non-free or restricted
-    archives are enabled)
+    apt-cache policy ('full' -- if non-free (Debian) or multiverse
+       (Ubuntu) areas are enabled)
 
 Template: neurodebian-repository/components
 Type: multiselect

diff --git a/tools/nd-aptenable b/tools/nd-aptenable
index 08812ccb3cbbdc1f5c6aaf55b8419e4b0e970ed9..d2c2c9d8aaa463fedc748655c4b6fd57c6bf5911 100755 (executable)
--- a/tools/nd-aptenable
+++ b/tools/nd-aptenable
@@ -422,7 +422,7 @@ if [ -z "$ae_release" ]; then
 fi
 
 if [ -z "$ae_flavor" ]; then
-    ae_flavor=$(echo "$apt_policy" | grep -e ",n=$ae_release," | grep -qe 'c=\(non-free\|restricted\)' && echo "full" || echo "libre")
+    ae_flavor=$(echo "$apt_policy" | grep -e ",n=$ae_release," | grep -qe 'c=\(non-free\|multiverse\)' && echo "full" || echo "libre")
 fi
 
 #