[pkg-java] r12945 - trunk/tomcat6/debian

[Thierry Carrez]

Author: ttx-guest
Date: 2010-08-25 09:45:58 +0000 (Wed, 25 Aug 2010)
New Revision: 12945

Modified:
   trunk/tomcat6/debian/changelog
   trunk/tomcat6/debian/tomcat6.postinst
Log:
Check for group existence to avoid postinst failure (LP: #611721)

Modified: trunk/tomcat6/debian/changelog
===================================================================
--- trunk/tomcat6/debian/changelog	2010-08-25 08:09:09 UTC (rev 12944)
+++ trunk/tomcat6/debian/changelog	2010-08-25 09:45:58 UTC (rev 12945)
@@ -1,3 +1,9 @@
+tomcat6 (6.0.28-5) UNRELEASED; urgency=low
+
+  * Check for group existence to avoid postinst failure (LP: #611721)
+
+ -- Thierry Carrez (ttx) <thierry.carrez at ubuntu.com>  Wed, 25 Aug 2010 09:36:49 +0200
+
 tomcat6 (6.0.28-4) unstable; urgency=medium
 
   * Ignore most errors during purge. (Closes: #591867)

Modified: trunk/tomcat6/debian/tomcat6.postinst
===================================================================
--- trunk/tomcat6/debian/tomcat6.postinst	2010-08-25 08:09:09 UTC (rev 12944)
+++ trunk/tomcat6/debian/tomcat6.postinst	2010-08-25 09:45:58 UTC (rev 12945)
@@ -25,7 +25,9 @@
 	ucf --debconf-ok --sum-file /usr/share/tomcat6/defaults.md5sum $tmpfile $CONFFILE
 	rm -f $tmpfile
 
-	addgroup --system "$TOMCAT6_GROUP" --quiet
+	if ! getent group "$TOMCAT6_GROUP" > /dev/null 2>&1 ; then
+	    addgroup --system "$TOMCAT6_GROUP" --quiet
+	fi
 	if ! id $TOMCAT6_USER > /dev/null 2>&1 ; then
 	    adduser --system --home /usr/share/tomcat6 --no-create-home \
 		--ingroup "$TOMCAT6_GROUP" --disabled-password --shell /bin/false \