r9087: Automated commit for Debian build of clsql upstream-version-2.7.10

diff --git a/ChangeLog b/ChangeLog
index 3ea33bc2a6425a459e1b1041ef253344c0c2e101..7fbde1ebdb5229e74e2c05522489f1ddf78944f9 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+19 Apr 2004 Kevin Rosenberg (kevin@rosenberg.net)
+       * Version 2.7.10
+       * base/utils.lisp: Fix command-output on CMUCL/SBCL
+
 18 Apr 2004 Kevin Rosenberg (kevin@rosenberg.net)
        * Version 2.7.9
        * db-sqlite/sqlite-sql.lisp: Fix sequence functions.

diff --git a/base/db-interface.lisp b/base/db-interface.lisp
index b2ba6e5533a1f20735a017757d517dd85553b7a7..fa07af92eddbd39c67e9cc0ae19a232a4edf6374 100644 (file)
--- a/base/db-interface.lisp
+++ b/base/db-interface.lisp
@@ -118,9 +118,6 @@ returns nil when result-set is finished."))
 if not found. May signal an error if unable to communicate with database server."))
 
 (defgeneric database-destroy (connection-spec database)
-  (:method (connection-spec (database t))
-          (declare (ignore connection-spec))
-          (signal-no-database-error database))
   (:documentation "Destroys (drops) a database."))
 
 (defgeneric database-truncate (database)

diff --git a/base/utils.lisp b/base/utils.lisp
index 2456d368bb3f8a961c63a7365a930e127cfa3933..84e28b937bc77ff1fa69dfedf8990e853c22db31 100644 (file)
--- a/base/utils.lisp
+++ b/base/utils.lisp
@@ -185,23 +185,33 @@ synchronously execute the result using a Bourne-compatible shell,
 returns (VALUES string-output error-output exit-status)"
   (let ((command (apply #'format nil control-string args)))
     #+sbcl
-    (let ((process (sb-ext:run-program  
+    (let* ((process (sb-ext:run-program  
                    "/bin/sh"
                    (list "-c" command)
-                   :input nil :output :stream :error :stream)))
+                   :input nil :output :stream :error :stream))
+          (output (read-stream-to-string (sb-impl::process-output process)))
+          (error (read-stream-to-string (sb-impl::process-error process))))
+      (close (sb-impl::process-output process))
+      (close (sb-impl::process-error process))
       (values
-       (sb-impl::process-output process)
-       (sb-impl::process-error process)
-       (sb-impl::process-exit-code process)))
+       output
+       error
+       (sb-impl::process-exit-code process)))    
+
     
     #+(or cmu scl)
-    (let ((process (ext:run-program  
-                   "/bin/sh"
-                   (list "-c" command)
-                   :input nil :output :stream :error :stream)))
+    (let* ((process (ext:run-program  
+                    "/bin/sh"
+                    (list "-c" command)
+                    :input nil :output :stream :error :stream))
+          (output (read-stream-to-string (ext::process-output process)))
+          (error (read-stream-to-string (ext::process-error process))))
+      (close (ext::process-output process))
+      (close (ext::process-error process))
+
       (values
-       (ext::process-output process)
-       (ext::process-error process)
+       output
+       error
        (ext::process-exit-code process)))    
 
     #+allegro

diff --git a/debian/changelog b/debian/changelog
index b9f28309a10dab930492376fd1b5648a67c32b79..48ac3b1cb2a20ee733ac302c1699ab03e8728cc3 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+cl-sql (2.7.10-1) unstable; urgency=low
+
+  * New upstream
+
+ -- Kevin M. Rosenberg <kmr@debian.org>  Mon, 19 Apr 2004 00:21:37 -0600
+
 cl-sql (2.7.9-1) unstable; urgency=low
 
   * New upstream