[pkg-lighttpd] r320 - lighttpd/trunk/debian

[madcoder at alioth.debian.org]

Author: madcoder
Date: 2008-04-13 10:52:16 +0000 (Sun, 13 Apr 2008)
New Revision: 320

Modified:
   lighttpd/trunk/debian/changelog
   lighttpd/trunk/debian/lighttpd.preinst
Log:
Closes: 472119


Modified: lighttpd/trunk/debian/changelog
===================================================================
--- lighttpd/trunk/debian/changelog	2008-04-13 10:46:42 UTC (rev 319)
+++ lighttpd/trunk/debian/changelog	2008-04-13 10:52:16 UTC (rev 320)
@@ -11,6 +11,9 @@
      + add it as a server.upload-dirs in lighttpd.conf.
      + purge it daily in lighttpd.cron.daily.
 
+  * Fix typo in lighttpd.preinst causing failure to update 05-auth symlink
+    properly (Closes: 472119).
+
  -- Pierre Habouzit <madcoder at debian.org>  Thu, 20 Mar 2008 00:53:45 +0100
 
 lighttpd (1.4.19-1~bpo40+1) etch-backports; urgency=low

Modified: lighttpd/trunk/debian/lighttpd.preinst
===================================================================
--- lighttpd/trunk/debian/lighttpd.preinst	2008-04-13 10:46:42 UTC (rev 319)
+++ lighttpd/trunk/debian/lighttpd.preinst	2008-04-13 10:52:16 UTC (rev 320)
@@ -19,10 +19,9 @@
         echo 1>&2 "Not touching conf-enabled/10-auth.conf because conf-enabled/05-auth.conf exists !!!"
         echo 1>&2 "Please read /usr/share/doc/lighttpd/NEWS.Debian"
     else
-        if test -h "$CE/10-auth.conf" && test "$(readlink -m "$CE/10-auth.conf")" = "$CE/10-auth.conf"; then
+        if test -h "$CE/10-auth.conf" && test "$(readlink -m "$CE/10-auth.conf")" = "$CA/10-auth.conf"; then
             echo "Updating conf-enabled symlink to 05-auth.conf accordingly"
-            rm -f "$CE/10-auth.conf"
-            ln -s "../conf-available/05-auth.conf" "$CE/05-auth.conf"
+            ln -s -f "../conf-available/05-auth.conf" "$CE/05-auth.conf"
         fi
         if test -f "$CE/10-auth.conf"; then
             echo "Renaming conf-enabled/10-auth.conf into conf-enabled/05-auth.conf"