Modify operation-done-p for new ASDF

diff --git a/ChangeLog b/ChangeLog
index 34cbe907a6683dea3fee1214c4e6a045b6d634b2..f50d67c63a982ff01858c36859a95fd0cf3fa470 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-06-15  Kevin Rosenberg <kevin@rosenberg.net>
+       * Version 5.1.1
+       * clsql-{uffi,mysql}.asd: Modify operation-done-p functions
+       to guard against change introduced in new ASDF traversing.
+
 2010-04-20  Kevin Rosenberg <kevin@rosenberg.net>
        * Version 5.1.0 [DEPENDENCY UPGRADE: UFFI 2.x needed]
        * clsql-uffi.asd: Depend on UFFI version >= 2.0

diff --git a/clsql-mysql.asd b/clsql-mysql.asd
index 6f4acfb18d58c23d72ed74087a5c2a699ec4be59..12b8479dbec78c9c1a4efa647b78d6096596555a 100644 (file)
--- a/clsql-mysql.asd
+++ b/clsql-mysql.asd
@@ -48,7 +48,8 @@
   t)
 
 (defmethod operation-done-p ((o load-op) (c clsql-mysql-source-file))
-  (and (symbol-function (intern (symbol-name '#:mysql-get-client-info)
+  (and (find-package '#:mysql)
+       (symbol-function (intern (symbol-name '#:mysql-get-client-info)
                                (find-package '#:mysql)))
        t))
 

diff --git a/clsql-uffi.asd b/clsql-uffi.asd
index 53c6152121868274cc98c66ae6b4e26fce24777a..5629d45b5c3a80d12cdae7afd5295da0507d6927 100644 (file)
--- a/clsql-uffi.asd
+++ b/clsql-uffi.asd
@@ -48,7 +48,8 @@
   nil) ;;; library will be loaded by a loader file
 
 (defmethod operation-done-p ((o load-op) (c clsql-uffi-source-file))
-  (and (symbol-function (intern (symbol-name '#:atol64)
+  (and (find-package '#:clsql-uffi)
+       (symbol-function (intern (symbol-name '#:atol64)
                                (find-package '#:clsql-uffi)))
        t))
 

diff --git a/debian/changelog b/debian/changelog
index 58b19995a7cee82df1f2862df8ce6ec2a9adc461..6235ba66ebacbe0b281fb87789eb6098afe6b9a7 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+cl-sql (5.1.1-1) unstable; urgency=low
+
+  * New upstream
+
+ -- Kevin M. Rosenberg <kmr@debian.org>  Sat, 15 May 2010 15:20:38 -0600
+
 cl-sql (5.1.0-1) unstable; urgency=low
 
   * New upstream - depends on UFFI 2.x