This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository tomcat7.
commit cb67361d8f0a6cf33700a5fb1edf2d03d9481a70 Author: Emmanuel Bourg <[email protected]> Date: Tue Aug 4 13:41:42 2015 +0200 Fixed an upgrade error when /etc/tomcat7/tomcat-users.xml is removed (LP: #1010791) --- debian/changelog | 8 ++++++++ debian/tomcat7.postinst | 4 +++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 9a0d91a..80654b4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +tomcat7 (7.0.63-2) UNRELEASED; urgency=medium + + * Team upload. + * Fixed an upgrade error when /etc/tomcat7/tomcat-users.xml is removed + (LP: #1010791) + + -- Emmanuel Bourg <[email protected]> Tue, 04 Aug 2015 13:41:13 +0200 + tomcat7 (7.0.63-1) unstable; urgency=medium * New upstream release diff --git a/debian/tomcat7.postinst b/debian/tomcat7.postinst index ef339db..7d8919b 100644 --- a/debian/tomcat7.postinst +++ b/debian/tomcat7.postinst @@ -49,7 +49,9 @@ case "$1" in # (an attacker may insert code in a webapp and have access to all tomcat configuration) # but those files should be readable by tomcat7, so we set the group to tomcat7 chown -Rh root:$TOMCAT7_GROUP /etc/tomcat7/* - chmod 640 /etc/tomcat7/tomcat-users.xml + if [ -f /etc/tomcat7/tomcat-users.xml ] ; then + chmod 640 /etc/tomcat7/tomcat-users.xml + fi chown -Rh $TOMCAT7_USER:$TOMCAT7_GROUP /var/lib/tomcat7/webapps /var/lib/tomcat7/common /var/lib/tomcat7/server /var/lib/tomcat7/shared chmod 775 /var/lib/tomcat7/webapps chmod 775 /etc/tomcat7/Catalina /etc/tomcat7/Catalina/localhost -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/tomcat7.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
