[Pkg-javascript-commits] [SCM] javascript-common branch, master, updated. 11

[Marcelo Jorge Vieira]

The following commit has been merged in the master branch:
commit 8794283dd38860cc2e977002e3c7f5bc803574c4
Author: Marcelo Jorge Vieira <metal at alucinados.com>
Date:   Mon Jul 29 10:28:16 2013 -0300

    Fixed postinst (Closes: #718249)
    
    Test if obsolete /etc/apache2/conf.d/ was removed by user before
    touching it. Thanks Jean-Michel Vourgère.

diff --git a/debian/javascript-common.postinst b/debian/javascript-common.postinst
index 66283a6..8516dbe 100644
--- a/debian/javascript-common.postinst
+++ b/debian/javascript-common.postinst
@@ -61,7 +61,11 @@ esac
 # 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

-- 
javascript-common