[Cdd-commits] cdd/common/cdd/templates common.templates,1.1,1.2 postinst,1.11,1.12 postrm,1.6,1.7

[Andreas Tille]

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

Modified Files:
	common.templates postinst postrm 
Log Message:
Removed echo from post{int,rm} because it conflicts with db_get


Index: common.templates
===================================================================
RCS file: /cvsroot/cdd/cdd/common/cdd/templates/common.templates,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- common.templates	12 Jun 2004 19:19:25 -0000	1.1
+++ common.templates	26 Jun 2004 07:07:54 -0000	1.2
@@ -11,8 +11,8 @@
 Default: end
 _Description: When do you like to build user menus?
  The meta packages of the #CDDNAME# Custom Debian Distribution do
- contain extra role based menus for users. These will be builded if
- user who is registered in a certain role calls update-menus.  This
+ contain extra role based menus for users. These will be built if
+ the user who is registered in a certain role calls update-menus.  This
  can be done automatically for all users who are registered for
  #CDDNAME# after installation of each single meta package (=now),
  at the end of the whole installation process to save time in case
@@ -21,4 +21,4 @@
   * now: Call update-menus after each meta package (time consuming).
   * end: Call update-menus only once at the end of the whole
          installation/upgrading process.
-  * newver: Do not call update-menus at all.
+  * never: Do not call update-menus at all.

Index: postrm
===================================================================
RCS file: /cvsroot/cdd/cdd/common/cdd/templates/postrm,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- postrm	21 Apr 2004 07:07:57 -0000	1.6
+++ postrm	26 Jun 2004 07:07:54 -0000	1.7
@@ -1,7 +1,8 @@
 #!/bin/bash -e
 
-echo "Removing package #PKG#."
-cdd-update-menus -d #CDD#
+## Echoing breaks debconf! 
+## echo "Removing package #PKG#."
+test -x /usr/sbin/cdd-update-menus && /usr/sbin/cdd-update-menus -d #CDD# 
 
 source /etc/cdd/cdd.conf
 if [ -s /etc/cdd/#CDD#/#CDD#.conf ] ; then source /etc/cdd/#CDD#/#CDD#.conf ; fi

Index: postinst
===================================================================
RCS file: /cvsroot/cdd/cdd/common/cdd/templates/postinst,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- postinst	12 Jun 2004 19:15:48 -0000	1.11
+++ postinst	26 Jun 2004 07:07:54 -0000	1.12
@@ -1,7 +1,8 @@
 #!/bin/bash -e
 
-echo "Installing package #PKG#."
-cdd-update-menus -d #CDD#
+## Echoing breaks debconf!
+## echo "Installing package #PKG#."
+test -x /usr/sbin/cdd-update-menus && /usr/sbin/cdd-update-menus -d #CDD#
 
 . /usr/share/debconf/confmodule
 db_version 2.0
@@ -34,7 +35,7 @@
 # This code should be removed for the stable release because we can not
 # care for clean updates to old testing verisons for endless time ...
 for ROLE in `getCDDRoleList #CDD#`; do
-        for CDDUSER in `getUsersInRole #CDD# ${ROLE}`; do
+        for CDDUSER in `getUsersInRole #CDD# ${ROLE} 1`; do
 		USERHOME="`getUserHome ${CDDUSER}`"
 		if [ -d ${USERHOME}/.menu ] ; then
 		    OLDENTRY="${USERHOME}/.menu/cdd-menu"