Control: tags -1 + patch

I missed the case where obsolete /etc/apache2/conf.d/ was already removed.

Attached is a patch with an extra test.

Thank you for the repport!
diff -Nru javascript-common-10/debian/changelog javascript-common-11/debian/changelog
--- javascript-common-10/debian/changelog	2013-07-28 22:57:03.000000000 +0000
+++ javascript-common-11/debian/changelog	2013-07-29 10:20:39.000000000 +0000
@@ -1,3 +1,10 @@
+javascript-common (11) UNRELEASED; urgency=low
+
+  * Test if obsolete /etc/apache2/conf.d/ was removed by user before
+    touching it. (Closes: #718249)
+
+ --  Jean-Michel Vourgère <jmv_...@nirgal.com>  Mon, 29 Jul 2013 10:16:39 +0000
+
 javascript-common (10) unstable; urgency=low
 
   * Downgrading webservers relation from 'recommends' to 'suggests'
diff -Nru javascript-common-10/debian/javascript-common.postinst javascript-common-11/debian/javascript-common.postinst
--- javascript-common-10/debian/javascript-common.postinst	2013-07-28 21:48:58.000000000 +0000
+++ javascript-common-11/debian/javascript-common.postinst	2013-07-29 10:18:40.000000000 +0000
@@ -61,7 +61,11 @@
 # Will make piupart more happy on upgrades
 if [ "$1" = "configure" ] && dpkg --compare-versions "$2" lt "9"
 then
-	rmdir --ignore-fail-on-non-empty /etc/apache2/conf.d
+	# Remove old /etc/apache2/conf.d if empty and not already removed by user:
+	if [ -d /etc/apache2/conf.d ]
+	then
+		rmdir --ignore-fail-on-non-empty /etc/apache2/conf.d
+	fi
 	 # This is a work around bug #584185:
 	if [ -d /etc/javascript-common ]
 	then
_______________________________________________
Pkg-javascript-devel mailing list
Pkg-javascript-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-javascript-devel

Reply via email to