[tomcat8] 01/01: Fixed an upgrade error when /etc/tomcat8/tomcat-users.xml is removed (LP: #1010791)

[Emmanuel Bourg]

This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch master
in repository tomcat8.

commit 9aa252ae8c447034ebe02d09f026378d4bf5613c
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Tue Aug 4 13:36:26 2015 +0200

    Fixed an upgrade error when /etc/tomcat8/tomcat-users.xml is removed (LP: #1010791)
---
 debian/changelog        | 8 ++++++++
 debian/tomcat8.postinst | 4 +++-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index c7b1b96..b07d0f8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+tomcat8 (8.0.24-2) UNRELEASED; urgency=medium
+
+  * Team upload.
+  * Fixed an upgrade error when /etc/tomcat8/tomcat-users.xml is removed
+    (LP: #1010791)
+
+ -- Emmanuel Bourg <ebourg at apache.org>  Tue, 04 Aug 2015 13:35:03 +0200
+
 tomcat8 (8.0.24-1) unstable; urgency=medium
 
   * Team upload.
diff --git a/debian/tomcat8.postinst b/debian/tomcat8.postinst
index c180c3c..fa8b73d 100644
--- a/debian/tomcat8.postinst
+++ b/debian/tomcat8.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 tomcat8, so we set the group to tomcat8
 	chown -Rh root:$TOMCAT8_GROUP /etc/tomcat8/*
-	chmod 640 /etc/tomcat8/tomcat-users.xml
+	if [ -f /etc/tomcat8/tomcat-users.xml ] ; then
+		chmod 640 /etc/tomcat8/tomcat-users.xml
+	fi
 	chown -Rh $TOMCAT8_USER:$TOMCAT8_GROUP /var/lib/tomcat8/webapps /var/lib/tomcat8/lib
 	chmod 775 /var/lib/tomcat8/webapps
 	chmod 775 /etc/tomcat8/Catalina /etc/tomcat8/Catalina/localhost

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/tomcat8.git