[pkg-java] r2766 - branches/tomcat5.5/feature/debian/debian

Marcus Better marcusb-guest at alioth.debian.org
Thu Nov 16 14:04:28 CET 2006


Author: marcusb-guest
Date: 2006-11-16 14:04:27 +0100 (Thu, 16 Nov 2006)
New Revision: 2766

Modified:
   branches/tomcat5.5/feature/debian/debian/tomcat5.5.postrm
Log:
Fix type: remove tomcat5 user instead of tomcat55 twice. Fix indentation. Fixes #393224.


Modified: branches/tomcat5.5/feature/debian/debian/tomcat5.5.postrm
===================================================================
--- branches/tomcat5.5/feature/debian/debian/tomcat5.5.postrm	2006-11-16 09:16:54 UTC (rev 2765)
+++ branches/tomcat5.5/feature/debian/debian/tomcat5.5.postrm	2006-11-16 13:04:27 UTC (rev 2766)
@@ -10,19 +10,19 @@
         # Remove user and log files (don't remove everything under
 	# /var/lib/tomcat5.5 because there might be user-installed webapps)
 	userdel tomcat55 || true
-  rm -rf /var/log/tomcat5.5 /var/cache/tomcat5.5 /var/lib/tomcat5.5/conf
+	rm -rf /var/log/tomcat5.5 /var/cache/tomcat5.5 /var/lib/tomcat5.5/conf
 	rm -f /var/lib/tomcat5.5/webapps/ROOT/WEB-INF/web.xml
 	rmdir --ignore-fail-on-non-empty \
 	    /var/lib/tomcat5.5/webapps/ROOT/WEB-INF \
 	    /var/lib/tomcat5.5/webapps/ROOT /var/lib/tomcat5.5/webapps \
 	    /var/lib/tomcat5.5 2>/dev/null || true
 	rmdir --ignore-fail-on-non-empty /etc/tomcat5.5/policy.d /etc/tomcat5.5
-  # remove user tomcat5 if package tomcat5 is 
-  # mardek as purged or has never been installed
-  if [ -n "$(dpkg -l tomcat5 | grep pn)" -o -n "$(dpkg -l tomcat5 | grep un)" ]
+    # remove user tomcat5 if package tomcat5 is 
+    # marked as purged or has never been installed
+    if [ -n "$(dpkg -l tomcat5 | grep pn)" -o -n "$(dpkg -l tomcat5 | grep un)" ]
     then
-      userdel tomcat55 || true
-  fi
+	userdel tomcat5 || true
+    fi
 
     ;;
 




More information about the pkg-java-commits mailing list