[DRE-commits] r5718 - trunk/redmine/debian

[Jérémy Lal]

Author: kapouer-guest
Date: 2010-07-30 13:14:54 +0000 (Fri, 30 Jul 2010)
New Revision: 5718

Modified:
   trunk/redmine/debian/config
   trunk/redmine/debian/postinst
   trunk/redmine/debian/postrm
   trunk/redmine/debian/prerm
Log:
Source dbconfig files in a subshell, or else variables gets global.

This fixes a lot of bugs/bad dbconfig behaviors.

Modified: trunk/redmine/debian/config
===================================================================
--- trunk/redmine/debian/config	2010-07-30 13:13:22 UTC (rev 5717)
+++ trunk/redmine/debian/config	2010-07-30 13:14:54 UTC (rev 5718)
@@ -132,8 +132,7 @@
 				else
 					dbc_basepath=""
 				fi
-				. /usr/share/dbconfig-common/dpkg/config
-				dbc_go redmine/instances/$fInstance $@
+				( . /usr/share/dbconfig-common/dpkg/config ; dbc_go redmine/instances/$fInstance $@ )
 				if [ $? -ne 0 ] ; then
 					if [ $fIndex -gt 0 ];then
 						STATE=$((($fIndex-1)*10 + 1))

Modified: trunk/redmine/debian/postinst
===================================================================
--- trunk/redmine/debian/postinst	2010-07-30 13:13:22 UTC (rev 5717)
+++ trunk/redmine/debian/postinst	2010-07-30 13:14:54 UTC (rev 5718)
@@ -11,20 +11,19 @@
 . /usr/share/debconf/confmodule
 
 # remove and purge old instances each time postinst is called
-. /usr/share/dbconfig-common/dpkg/prerm
 db_get redmine/old-instances || true
 gOldInstances="${RET}"
 for lInstance in $gOldInstances; do
 	db_get redmine/instances/$lInstance/dbconfig-install || true
 	if [ "$RET" = "true" ]; then
-		dbc_go redmine/instances/$lInstance remove
+		( . /usr/share/dbconfig-common/dpkg/prerm ; dbc_go redmine/instances/$lInstance remove )
 	fi
 done
-. /usr/share/dbconfig-common/dpkg/postrm
+
 for lInstance in $gOldInstances; do
 	db_get redmine/instances/$lInstance/dbconfig-install || true
 	if [ "$RET" = "true" ]; then
-		dbc_go redmine/instances/$lInstance purge
+		( . /usr/share/dbconfig-common/dpkg/postrm ; dbc_go redmine/instances/$lInstance purge )
 	fi
 	if which ucf >/dev/null 2>&1; then
 		ucf --purge /etc/redmine/$lInstance/database.yml
@@ -35,8 +34,6 @@
 done
 db_set redmine/old-instances ""
 
-. /usr/share/dbconfig-common/dpkg/postinst
-
 fRailsEnv=production
 fRailsLog=/var/log/redmine
 fRailsVar=/var/lib/redmine
@@ -155,7 +152,7 @@
 		fi
 		
 		ucf --purge $fYml
-		dbc_go redmine/instances/$lInstance $@
+		( . /usr/share/dbconfig-common/dpkg/postinst ; dbc_go redmine/instances/$lInstance $@ )
 		ucf --purge $fYml
 		
 		if [ -e $fYml ]; then

Modified: trunk/redmine/debian/postrm
===================================================================
--- trunk/redmine/debian/postrm	2010-07-30 13:13:22 UTC (rev 5717)
+++ trunk/redmine/debian/postrm	2010-07-30 13:14:54 UTC (rev 5718)
@@ -16,14 +16,13 @@
 	
 	remove)
 		if [ -f /usr/share/dbconfig-common/dpkg/postrm ]; then
-			. /usr/share/dbconfig-common/dpkg/postrm
 			
 			db_get redmine/old-instances || true
 			gOldInstances="${RET}"
 			for lInstance in $gOldInstances; do
 				db_get redmine/instances/$lInstance/dbconfig-install || true
 				if [ "$RET" = "true" ]; then
-					dbc_go redmine/instances/$lInstance $@
+					( . /usr/share/dbconfig-common/dpkg/postrm ; dbc_go redmine/instances/$lInstance $@ )
 				fi
 			done
 			
@@ -32,7 +31,7 @@
 			for lInstance in $gInstances; do
 				db_get redmine/instances/$lInstance/dbconfig-install || true
 				if [ "$RET" = "true" ]; then
-					dbc_go redmine/instances/$lInstance $@
+					( . /usr/share/dbconfig-common/dpkg/postrm ; dbc_go redmine/instances/$lInstance $@ )
 				fi
 			done
 		fi
@@ -44,17 +43,16 @@
 		db_get redmine/current-instances || true
 		gInstances="${RET}"
 		if [ -f /usr/share/dbconfig-common/dpkg/postrm ]; then
-			. /usr/share/dbconfig-common/dpkg/postrm
 			for lInstance in $gOldInstances; do
 				db_get redmine/instances/$lInstance/dbconfig-install || true
 				if [ "$RET" = "true" ]; then
-					dbc_go redmine/instances/$lInstance $@
+					( . /usr/share/dbconfig-common/dpkg/postrm ; dbc_go redmine/instances/$lInstance $@ )
 				fi
 			done
 			for lInstance in $gInstances; do
 				db_get redmine/instances/$lInstance/dbconfig-install || true
 				if [ "$RET" = "true" ]; then
-					dbc_go redmine/instances/$lInstance $@
+					( . /usr/share/dbconfig-common/dpkg/postrm ; dbc_go redmine/instances/$lInstance $@ )
 				fi
 			done
 		fi

Modified: trunk/redmine/debian/prerm
===================================================================
--- trunk/redmine/debian/prerm	2010-07-30 13:13:22 UTC (rev 5717)
+++ trunk/redmine/debian/prerm	2010-07-30 13:14:54 UTC (rev 5718)
@@ -7,7 +7,6 @@
 #set -x
 
 . /usr/share/debconf/confmodule
-. /usr/share/dbconfig-common/dpkg/prerm
 
 case "$1" in
 	remove)
@@ -16,7 +15,7 @@
 		for lInstance in $gOldInstances; do
 			db_get redmine/instances/$lInstance/dbconfig-install || true
 			if [ "$RET" = "true" ]; then
-				dbc_go redmine/instances/$lInstance $@
+				( . /usr/share/dbconfig-common/dpkg/prerm ; dbc_go redmine/instances/$lInstance $@ )
 			fi
 		done
 		
@@ -25,7 +24,7 @@
 		for lInstance in $gInstances; do
 			db_get redmine/instances/$lInstance/dbconfig-install || true
 			if [ "$RET" = "true" ]; then
-				dbc_go redmine/instances/$lInstance $@
+				( . /usr/share/dbconfig-common/dpkg/prerm ; dbc_go redmine/instances/$lInstance $@ )
 			fi
 		done