Author: twerner Date: 2010-08-06 01:37:55 +0000 (Fri, 06 Aug 2010) New Revision: 12877
Modified: trunk/tomcat6/debian/changelog trunk/tomcat6/debian/tomcat6.postrm Log: Ignore most errors during purge. (Closes: #591867) Modified: trunk/tomcat6/debian/changelog =================================================================== --- trunk/tomcat6/debian/changelog 2010-08-06 00:54:14 UTC (rev 12876) +++ trunk/tomcat6/debian/changelog 2010-08-06 01:37:55 UTC (rev 12877) @@ -1,3 +1,9 @@ +tomcat6 (6.0.28-4) unstable; urgency=low + + * Ignore most errors during purge. (Closes: #591867) + + -- Torsten Werner <[email protected]> Fri, 06 Aug 2010 03:36:28 +0200 + tomcat6 (6.0.28-3) unstable; urgency=low * UNRELEASED Modified: trunk/tomcat6/debian/tomcat6.postrm =================================================================== --- trunk/tomcat6/debian/tomcat6.postrm 2010-08-06 00:54:14 UTC (rev 12876) +++ trunk/tomcat6/debian/tomcat6.postrm 2010-08-06 01:37:55 UTC (rev 12877) @@ -43,22 +43,25 @@ ;; purge) + # ignore errors during purge + set +e if [ -x "/usr/bin/ucf" ]; then ucf --purge $CONFFILE fi rm -rf /var/log/tomcat6 /var/lib/tomcat6/temp $CONFFILE if [ -d "/var/lib/tomcat6" ] ; then - rmdir --ignore-fail-on-non-empty /var/lib/tomcat6 || true + rmdir --ignore-fail-on-non-empty /var/lib/tomcat6 fi rmdir --ignore-fail-on-non-empty /etc/tomcat6/policy.d \ - /etc/tomcat6/Catalina/localhost /etc/tomcat6/Catalina /etc/tomcat6 || true - # Put all files owned by group tomcat6 back into root group before deleting - # the tomcat6 user and group - chown -Rh root:root /etc/tomcat6/ + /etc/tomcat6/Catalina/localhost /etc/tomcat6/Catalina /etc/tomcat6 + # Put all files owned by group tomcat6 back into root group before deleting + # the tomcat6 user and group + chown -Rhf root:root /etc/tomcat6/ # Remove user/group and log files (don't remove everything under # /var/lib/tomcat6 because there might be user-installed webapps) - deluser tomcat6 || true - delgroup tomcat6 || true + deluser tomcat6 + delgroup tomcat6 + set -e ;; upgrade|failed-upgrade|abort-install|abort-upgrade|disappear) _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/mailman/listinfo/pkg-java-commits
