[debian-edu-commits] debian-edu/ 130/183: Ignore de-activated profiles when checking if we're in the simple case where caching of profile assignment is supported

[Alexander Alemayhu]

This is an automated email from the git hooks/post-receive script.

ccscanf-guest pushed a commit to branch master
in repository desktop-profiles.

commit f69b08a17b5f55ff686580688d89d33a16a51c5d
Author: Bart Cornelis <cobaco at linux.be>
Date:   Wed Dec 13 17:23:12 2006 +0000

    Ignore de-activated profiles when checking if we're in the simple case where
    caching of profile assignment is supported
---
 update-profile-cache | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/update-profile-cache b/update-profile-cache
index 5a0c6cd..d429cf5 100755
--- a/update-profile-cache
+++ b/update-profile-cache
@@ -24,9 +24,13 @@
 ##################  
 # set $CACHE_TYPE  
 ##################
-  # if we have at least 1 group or command requirement then there will be at 
-  # least 1 character in the requirement that's neither whitespace nor '!'
-  if(test $(list-desktop-profiles -r '[^[:space:]!]' | wc -l) -ne 0); then
+  # if is true when there's at least 1 non-deactivated profile with a 
+  # group or command requirment
+  # (a group or command requirement means at least 1 character in the 
+  # requirement that's neither whitespace nor '!')
+  if( test $(list-desktop-profiles -e '$REQUIREMENTS' -r '[^[:space:]!]' | \
+      grep -v '^![[:space:]]\|[[:space:]]!$\|[[:space:]]![[:space:]]\|^!$' | \
+      wc -l) -ne 0); then
     CACHE_TYPE=none;
   else 
     CACHE_TYPE=static

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-edu/pkg-team/desktop-profiles.git