From: Yaroslav Halchenko <debian@onerussian.com>
Date: Wed, 6 Aug 2014 03:43:53 +0000 (-0400)
Subject: BF: actually we need to aim for multiverse (not restricted) on ubuntus to decide... 
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=397a940b6025de234818eb4d4f67b02438f4efa6;p=neurodebian.git

BF: actually we need to aim for multiverse (not restricted) on ubuntus to decide for "full" flavor
---

diff --git a/debian/neurodebian-repository.templates b/debian/neurodebian-repository.templates
index eb31072..d2896c8 100644
--- 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 08812cc..d2c2c9d 100755
--- 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
 
 #