[Pkg-mono-svn-commits] [SCM] xsp branch, master-experimental, updated. debian/2.6.5-1

[Jo Shields]

The following commit has been merged in the master-experimental branch:
commit d4e90358c0af3a63fc0f58338357f28ff9016b9f
Author: Jo Shields <directhex at apebox.org>
Date:   Mon Aug 9 02:06:10 2010 +0100

    fix removal of /var/run, which is assumed to exist in postinst

diff --git a/debian/changelog b/debian/changelog
index c39e504..9f92aaa 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -22,7 +22,9 @@ xsp (2.6.5-1) UNRELEASED; urgency=low
     debian/mono-apache-server.links:
     + Fix dangling symlinks to non-gzipped manpages
   * debian/mono-xsp1.dirs,
-    debian/mono-xsp2.dirs:
+    debian/mono-xsp2.dirs,
+    debian/mono-xsp1.postinst,
+    debian/mono-xsp2.postinst:
     + Stuff in /var/run definitely shouldn't be in the packages, since 
       it's entirely possible that this directory is on a tmpfs which may be
       lost at boot. Since we recreate the dir in the init scripts anyway, 
diff --git a/debian/mono-xsp1.postinst b/debian/mono-xsp1.postinst
index 096cb3d..1cf9350 100644
--- a/debian/mono-xsp1.postinst
+++ b/debian/mono-xsp1.postinst
@@ -82,7 +82,9 @@ case "$1" in
 	fi
 
 	# chmod the working directories
-	chown -R www-data:www-data /var/run/mono-xsp1
+	if [ -f /var/run/$NAME.pid ]; then
+	    chown -R www-data:www-data /var/run/mono-xsp1
+	fi
 	mono-xsp-update
 	if [ "$RET" = "true" ]; then
 	    if should_start -a $autostart = "true" ; then
diff --git a/debian/mono-xsp2.postinst b/debian/mono-xsp2.postinst
index 497ff8d..f8b2d90 100644
--- a/debian/mono-xsp2.postinst
+++ b/debian/mono-xsp2.postinst
@@ -81,7 +81,9 @@ case "$1" in
 	fi
 
 	# chmod the working directories
-	chown -R www-data:www-data /var/run/mono-xsp2
+	if [ -f /var/run/$NAME.pid ]; then
+	    chown -R www-data:www-data /var/run/mono-xsp2
+	fi
 	mono-xsp2-update
 	if [ "$RET" = "true" ]; then
 	    if should_start -a $autostart = "true" ; then

-- 
xsp