[Dbconfig-common-changes] [dbconfig-common] r277 - in trunk: dpkg internal

[Sean Finney]

Author: seanius
Date: 2006-08-02 04:28:24 +0000 (Wed, 02 Aug 2006)
New Revision: 277

Modified:
   trunk/dpkg/common
   trunk/dpkg/config
   trunk/internal/common
Log:
even more fixes for importing/preserving settings


Modified: trunk/dpkg/common
===================================================================
--- trunk/dpkg/common	2006-08-01 23:31:51 UTC (rev 276)
+++ trunk/dpkg/common	2006-08-02 04:28:24 UTC (rev 277)
@@ -293,6 +293,24 @@
 		fi
 	;;
 	esac
+
+	if [ "$dbc_debug" ]; then
+		dbc_debug "settings determined from dbc_read_package_debconf:"
+		dbc_debug "\tdbc_install=$dbc_install"
+		dbc_debug "\tdbc_upgrade=$dbc_upgrade"
+		dbc_debug "\tdbc_remove=$dbc_remove"
+		dbc_debug "\tdbc_dbtype=$dbc_dbtype"
+		dbc_debug "\tdbc_dbuser=$dbc_dbuser"
+		dbc_debug "\tdbc_dbpass=$dbc_dbpass"
+		dbc_debug "\tdbc_dbadmin=$dbc_dbadmin"
+		dbc_debug "\tdbc_dbadmpass=$dbc_dbadmpass"
+		dbc_debug "\tdbc_dbserver=$dbc_dbserver"
+		dbc_debug "\tdbc_dbport=$dbc_dbport"
+		dbc_debug "\tdbc_dbname=$dbc_dbname"
+		dbc_debug "\tdbc_authmethod_admin=$dbc_authmethod_admin"
+		dbc_debug "\tdbc_authmethod_user=$dbc_authmethod_user"
+		dbc_debug "\tdbc_ssl=$dbc_ssl"
+	fi
 }
 
 ###

Modified: trunk/dpkg/config
===================================================================
--- trunk/dpkg/config	2006-08-01 23:31:51 UTC (rev 276)
+++ trunk/dpkg/config	2006-08-02 04:28:24 UTC (rev 277)
@@ -107,7 +107,11 @@
 						db_fset $dbc_package/$f seen true || true
 					done
 					db_set $dbc_package/remote/host "$dbc_dbserver"
+					db_set $dbc_package/remote/newhost "$dbc_dbserver"
 					db_set $dbc_package/remote/port "$dbc_dbport"
+					if [ "$dbc_dbserver" ]; then
+						db_set $dbc_package/$dbc_dbtype/method "tcp/ip"
+					fi
 				fi
 
 				db_set $dbc_package/database-type $dbc_dbtype

Modified: trunk/internal/common
===================================================================
--- trunk/internal/common	2006-08-01 23:31:51 UTC (rev 276)
+++ trunk/internal/common	2006-08-02 04:28:24 UTC (rev 277)
@@ -11,7 +11,7 @@
 dbc_logpart(){
 	# for the time being, at least, let's default to verbose
 	#if [ "$dbc_debug" ]; then
-		echo -n "$@ " > /dev/stderr
+		echo -ne "$@ " > /dev/stderr
 	#fi
 	if [ "$dbc_log" ]; then
 		dbc_log="$dbc_log $@"
@@ -26,7 +26,7 @@
 dbc_logline(){
 	# for the time being, at least, let's default to verbose
 	#if [ "$dbc_debug" ]; then
-		echo "$@." > /dev/stderr
+		echo -e "$@." > /dev/stderr
 	#fi
 	if [ "$dbc_log" ]; then
 		dbc_log="$dbc_log $@."