r2889: *** empty log message ***

diff --git a/db-postgresql-socket/postgresql-socket-api.cl b/db-postgresql-socket/postgresql-socket-api.cl
index b64bdeaf254e2b51c6e8c5eadafd5070b3cbc635..8a580b7bac65b43293dd6f29150f15617065ca22 100644 (file)
--- a/db-postgresql-socket/postgresql-socket-api.cl
+++ b/db-postgresql-socket/postgresql-socket-api.cl
@@ -9,7 +9,7 @@
 ;;;;                
 ;;;; Date Started:  Feb 2002
 ;;;;
-;;;; $Id: postgresql-socket-api.cl,v 1.1 2002/09/18 07:43:41 kevin Exp $
+;;;; $Id: postgresql-socket-api.cl,v 1.2 2002/09/29 18:54:17 kevin Exp $
 ;;;;
 ;;;; This file, part of CLSQL, is Copyright (c) 2002 by Kevin M. Rosenberg
 ;;;; and Copyright (c) 1999-2001 by Pierre R. Mai
@@ -227,7 +227,7 @@ socket interface"
     (uffi:load-foreign-library 
      (uffi:find-foreign-library "libcrypt"
                           '("/usr/lib/" "/usr/local/lib/" "/lib/"))
-     :supporting-libaries '("c"))
+     :supporting-libraries '("c"))
     (eval '(uffi:def-function "crypt" 
            ((key :cstring)
             (salt :cstring))

diff --git a/db-postgresql-socket/postgresql-socket-sql.cl b/db-postgresql-socket/postgresql-socket-sql.cl
index 4532dc24054771bb5f4165fce7a4d56a5a45f95c..9ca2af3f5735bcaba7cb609e3a0ad8f1db7af289 100644 (file)
--- a/db-postgresql-socket/postgresql-socket-sql.cl
+++ b/db-postgresql-socket/postgresql-socket-sql.cl
@@ -8,7 +8,7 @@
 ;;;;                Original code by Pierre R. Mai 
 ;;;; Date Started:  Feb 2002
 ;;;;
-;;;; $Id: postgresql-socket-sql.cl,v 1.1 2002/09/18 07:43:41 kevin Exp $
+;;;; $Id: postgresql-socket-sql.cl,v 1.2 2002/09/29 18:54:17 kevin Exp $
 ;;;;
 ;;;; This file, part of CLSQL, is Copyright (c) 2002 by Kevin M. Rosenberg
 ;;;; and Copyright (c) 1999-2001 by Pierre R. Mai
@@ -176,20 +176,20 @@ doesn't depend on UFFI."
                                      :options options :tty tty
                                      :database db :user user
                                      :password password))
-      (:no-error (connection)
-       ;; Success, make instance
-       (make-instance 'postgresql-socket-database
-                      :name (database-name-from-spec connection-spec
-                                                     database-type)
-                      :connection-spec connection-spec
-                      :connection connection))
       (postgresql-error (c)
        ;; Connect failed
        (error 'clsql-connect-error
               :database-type database-type
               :connection-spec connection-spec
               :errno (type-of c)
-              :error (postgresql-condition-message c))))))
+              :error (postgresql-condition-message c)))
+      (:no-error (connection)
+                ;; Success, make instance
+                (make-instance 'postgresql-socket-database
+                               :name (database-name-from-spec connection-spec
+                                                              database-type)
+                               :connection-spec connection-spec
+                               :connection connection)))))
 
 (defmethod database-disconnect ((database postgresql-socket-database))
   (close-postgresql-connection (database-connection database))

diff --git a/debian/changelog b/debian/changelog
index 6d18fb330aef69682c4c0067b12c6472cff0590e..036f8df35468cfb836e48e5cc723b706085293b5 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 cl-sql (0.9.5-1) unstable; urgency=low
 
   * Fix defgeneric form in db-interfaces.cl
+  * Fix load-libraris call in postgresql-socket-api.cl
 
  -- Kevin M. Rosenberg <kmr@debian.org>  Fri, 27 Sep 2002 08:55:33 -0600