[Cdd-commits] cdd/common/cdd/templates common.config,1.4,1.5 common.postinst,1.6,1.7

[Andreas Tille]

Update of /cvsroot/cdd/cdd/common/cdd/templates
In directory haydn:/tmp/cvs-serv22879/cdd/templates

Modified Files:
	common.config common.postinst 
Log Message:
Fixes various stupid bugs in transition from get-group-users to cdd-tools


Index: common.config
===================================================================
RCS file: /cvsroot/cdd/cdd/common/cdd/templates/common.config,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- common.config	18 Jun 2004 12:33:17 -0000	1.4
+++ common.config	22 Jun 2004 20:55:16 -0000	1.5
@@ -21,10 +21,10 @@
 addRole #CDD# #CDD#
 
 # Login names of all users of the system as comma separated list 
-USERS=`getAllUsers 0`
+USERS=`getAllUsers 0 ,`
 
 # "login (Real Name)" of users registered to the CDD #CDD#
-CDDUSERS=`getUsersInRole #CDD# #CDD# ,`
+CDDUSERS=`getUsersInRole #CDD# #CDD# 0 ,`
 
 db_set #CDD#-common/group "$CDDUSERS"
 db_subst #CDD#-common/group users "$USERS"

Index: common.postinst
===================================================================
RCS file: /cvsroot/cdd/cdd/common/cdd/templates/common.postinst,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- common.postinst	18 Jun 2004 12:33:17 -0000	1.6
+++ common.postinst	22 Jun 2004 20:55:16 -0000	1.7
@@ -5,11 +5,13 @@
    echo "Custom Debian Distribution configuration file /etc/cdd/cdd.conf is missing."
    exit -1
 fi
+. /etc/cdd/cdd.conf
 
 if [ ! -f /etc/cdd/#CDD#/#CDD#.conf ] ; then
    echo "#CDDNAME# configuration file /etc/cdd/#CDD#/#CDD#.conf is missing."
    exit -1
 fi
+. /etc/cdd/#CDD#/#CDD#.conf
 
 # Source debconf library.
 . /usr/share/debconf/confmodule
@@ -17,7 +19,7 @@
 
 db_get #CDD#-common/group 
 
-CURRENTCDDUSERS=`getUsersInRole #CDD# #CDD#`
+CURRENTCDDUSERS=`getUsersInRole #CDD# #CDD# 1`
 # Add those users which were selected but are not yet in the group
 for user in `echo "$RET" | sed "s/([^)]*)//g" | sed "s/ //g" |  tr ',' '\n'` ; do
    if [ `echo "${CURRENTCDDUSERS}" | grep -c -w "$user"` -eq 0 ] ; then