[DRE-commits] [SCM] ruby-thin.git branch, master, updated. upstream/1.2.11-36-g2444ae1

[Ryan Niebur]

The following commit has been merged in the master branch:
commit 2444ae1fd503d91eaec73984adcdb6246a132d60
Author: Ryan Niebur <ryanryan52 at gmail.com>
Date:   Tue Jan 24 09:37:24 2012 -0800

    improve thin upgrade process in preinst, for a corner case I thought of

diff --git a/debian/thin.preinst b/debian/thin.preinst
index d08ea7b..8a224fe 100644
--- a/debian/thin.preinst
+++ b/debian/thin.preinst
@@ -1,7 +1,10 @@
-if [ "$1" = "install" -a -e /etc/init.d/thin1.8 ] || ([ "$1" = "upgrade" ] && dpkg --compare-versions "$1" lt 1.3.1-1); then
-   if [ -h /etc/init.d/thin ]; then
-      rm -f /etc/init.d/thin
-   fi
+# Just check if the old thin init.d conffile symlink needs to be removed
+if [ -h /etc/init.d/thin ] && [ "$(readlink /etc/init.d/thin)" = "thin1.8" ]; then
+  rm -f /etc/init.d/thin
 fi
 
+# Removed following conditions, in case prior thin package was installed and removed, but not purged (and thin1.8 was purged? this is a corner case, I admit)
+# if [ "$1" = "install" -a -e /etc/init.d/thin1.8 ] || ([ "$1" = "upgrade" ] && dpkg --compare-versions "$1" lt 1.3.1-1); then
+# fi
+
 #DEBHELPER#

-- 
ruby-thin.git