[pkg-java] r3627 - trunk/tomcat5.5/debian

[marcusb-guest at alioth.debian.org]

Author: marcusb-guest
Date: 2007-06-07 19:19:54 +0000 (Thu, 07 Jun 2007)
New Revision: 3627

Modified:
   trunk/tomcat5.5/debian/changelog
   trunk/tomcat5.5/debian/tomcat5.5.init
Log:
Use find instead of globbing when emptying temp directory.


Modified: trunk/tomcat5.5/debian/changelog
===================================================================
--- trunk/tomcat5.5/debian/changelog	2007-06-07 19:17:32 UTC (rev 3626)
+++ trunk/tomcat5.5/debian/changelog	2007-06-07 19:19:54 UTC (rev 3627)
@@ -6,10 +6,12 @@
     #426761)
   * Make sure files under /var/lib/tomcat5.5/conf are not
     executable. Thanks to Marco Nenciarini. (Closes: #426740)
+  * Fixes a failure to start if the temp directory contained too many
+    files. Thanks to Maarten van der Hoef (Closes: #427978)
   * tomcat5.5-admin now depends on libcommons-collections3-java and
     libcommons-digester-java.
 
- -- Marcus Better <marcus at better.se>  Mon, 21 May 2007 13:25:10 +0200
+ -- Marcus Better <marcus at better.se>  Thu, 07 Jun 2007 21:19:14 +0200
 
 tomcat5.5 (5.5.20-5) unstable; urgency=low
 

Modified: trunk/tomcat5.5/debian/tomcat5.5.init
===================================================================
--- trunk/tomcat5.5/debian/tomcat5.5.init	2007-06-07 19:17:32 UTC (rev 3626)
+++ trunk/tomcat5.5/debian/tomcat5.5.init	2007-06-07 19:19:54 UTC (rev 3627)
@@ -145,7 +145,7 @@
 			>> "$CATALINA_BASE/conf/catalina.policy"
 
 		# Clean up and set permissions on required files
-		rm -rf "$CATALINA_BASE"/temp/*
+		find "$CATALINA_BASE"/temp/ -mindepth 1 -exec rm -f {} +
 		chown --dereference "$TOMCAT5_USER" "$CATALINA_BASE/conf" \
 			"$CATALINA_BASE/conf/tomcat-users.xml" \
 			"$CATALINA_BASE/logs" "$CATALINA_BASE/temp" \