[SCM] Git repository for pkg-virtuoso branch, master, updated. debian/6.1.3+dfsg1-2.1-65-g93cc576

[José Manuel Santamar?==?UTF-8?Q?ía Lema]

The following commit has been merged in the master branch:
commit a98fbeb06cc89d2f935417f43ce489ddfe0de42e
Author: José Manuel Santamaría Lema <panfaust at gmail.com>
Date:   Tue Jan 15 23:19:22 2013 +0100

    Use ODBCSEARCH=ODBC_SYSTEM_DSN when calling odbcinst.

diff --git a/debian/changelog b/debian/changelog
index 3ce8a77..4a11257 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,19 @@
+virtuoso-opensource (6.1.4+dfsg1-3) UNRELEASED; urgency=low
+
+  * The previous upload didn't actually fix the bug #677286: "unowned files
+    after purge (/root/.odbc.ini)". Looks like this is happening because of a
+    bug in odbcinst, which ignores the -l option (when passing -l it should
+    deal with /etc/odbc.ini and not touch $HOME/.odbc.ini). So I workarounded
+    the bug changing again virtuoso-opensource-6.1.prerm; I removed the
+    previous workaround and now odbinst is executed thus:
+    ODBCSEARCH=ODBC_SYSTEM_DSN odbcinst <arguments_and_stuff>
+    Setting that environment variable should override the arguments given in the
+    command line, it works both as a workaround for the "unowned files after
+    purge" problem and forces obdcinst to actually use the system DSN so it
+    will use /etc/odbc.ini, never $HOME/.odbc.ini (Closes: #677286).
+
+ -- José Manuel Santamaría Lema <panfaust at gmail.com>  Thu, 03 Jan 2013 20:30:42 +0100
+
 virtuoso-opensource (6.1.4+dfsg1-2) unstable; urgency=low
 
   * Add portable-method-for-escaping-symbol-gawk.diff, fixes the conductor web
diff --git a/debian/virtuoso-opensource-6.1.prerm b/debian/virtuoso-opensource-6.1.prerm
index 8ede6e3..0fc1593 100644
--- a/debian/virtuoso-opensource-6.1.prerm
+++ b/debian/virtuoso-opensource-6.1.prerm
@@ -9,17 +9,12 @@ ${DEBIAN_SCRIPT_TRACE:+ echo "#42#DEBUG# RUNNING $0 $*" 1>&2 }
 
 db_get virtuoso-opensource-6.1/register-odbc-dsn || true
 if [ "$RET" = "true" ]; then
-	if [ ! -f "$HOME/.odbc.ini" ]; then
-		REMOVE_ODBC_INI=true
-	fi
-	odbcinst -u -s -l -n VOS || true
-	# The previous odbcinst command may create the file $HOME/.odbc.ini
-	# if it didn't exist previously, leaving unowned files after removing
-	# the package, so we remove the .odbc.ini if it's neccesary, see:
-	# http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=677286
-	if [ -n "$REMOVE_ODBC_INI" ]; then
-		rm -f $HOME/.odbc.ini
-	fi	
+	# We set ODBCSEARCH=ODBC_SYSTEM_DSN because looks like odbcinst has a bug,
+	# it ignores the -l option when uninstalling a data source. See:
+	# http://bugs.debian.org/698248
+	# and
+	# http://bugs.debian.org/677286
+	ODBCSEARCH=ODBC_SYSTEM_DSN odbcinst -u -s -l -n VOS || true
 fi
 
 # removing from list of owners of this question removes us from it's choices

-- 
Git repository for pkg-virtuoso