[Dbconfig-common-changes] [dbconfig-common] r281 - in trunk: debian internal

[Sean Finney]

Author: seanius
Date: 2006-08-03 00:09:02 +0000 (Thu, 03 Aug 2006)
New Revision: 281

Modified:
   trunk/debian/changelog
   trunk/internal/pgsql
Log:
remove an unsed variable, and prep for upload

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2006-08-02 07:26:12 UTC (rev 280)
+++ trunk/debian/changelog	2006-08-03 00:09:02 UTC (rev 281)
@@ -1,7 +1,5 @@
-dbconfig-common (1.8.18) UNRELEASED; urgency=low
+dbconfig-common (1.8.18) unstable; urgency=low
 
-  * NOT RELEASED YET
-
   [ sean finney ]
   * no longer end php-style generated files with a ?>, as it's 
     superfluous and can reportedly cause problems (closes: #379979).
@@ -16,7 +14,8 @@
   * fixed/improved pgsql authentication method autodetection.
   * new db-test-pgsql-migration-{1.9,2.0} packages to both show and
     test how to migrate from previous non-dbc packaging.
-  * fix for sh-format include files from dbconfig-load-include.
+  * fix for sh-format include files from dbconfig-load-include.  thanks
+    to Torsten Werner for finding this problem.
   * remove import-oldsettings template, i don't think the need
     merits having it.
   * packages that migrate to dbconfig-common no longer get the confusing
@@ -27,7 +26,7 @@
   [ Bart Cornelis (cobaco) ]
   * Updated Dutch translation
 
- -- sean finney <seanius at debian.org>  Wed, 02 Aug 2006 00:24:57 -0700
+ -- sean finney <seanius at debian.org>  Wed, 02 Aug 2006 17:08:29 -0700
 
 dbconfig-common (1.8.17) unstable; urgency=low
 

Modified: trunk/internal/pgsql
===================================================================
--- trunk/internal/pgsql	2006-08-02 07:26:12 UTC (rev 280)
+++ trunk/internal/pgsql	2006-08-03 00:09:02 UTC (rev 281)
@@ -42,16 +42,14 @@
 }
 
 _dbc_psql_cmd_setup(){
-	local localuser method remoteuser remotepass
+	local localuser remoteuser remotepass
 	localuser=`_dbc_psql_local_username`
 	remoteuser=`_dbc_psql_remote_username`
 	_dbc_pgsql_tmpdir=`mktemp -dt dbconfig-common.psql_home.XXXXXX`
 	if [ $? -ne 0 ]; then return 1; fi
 	if [ "$remoteuser" = "$dbc_dbadmin" ]; then
-		method="$dbc_authmethod_admin"
 		remotepass="$dbc_dbadmpass"
 	else
-		method="$dbc_authmethod_user"
 		remotepass="$dbc_dbpass"
 	fi
 	touch "${_dbc_pgsql_tmpdir}/.pgpass"