@@ -514,24 +514,23 @@
       (sqlite3:first-row db "SELECT id,action,owner,state,target,name,testpatt,keylock,params WHERE
                                params LIKE ? AND state LIKE ? AND action LIKE ? AND testpatt LIKE ?;"
 			 param-key state-patt action-patt test-patt)))))
 
 (define (tasks:find-task-queue-records dbstruct target run-name test-patt state-patt action-patt)
-  ;; (handle-exceptions
-  ;;  exn
-  ;;  '()
-  ;;  (sqlite3:first-row
-  (let ((db (db:delay-if-busy (db:get-db dbstruct)))
-	(res '()))
-    (sqlite3:for-each-row 
-     (lambda (a . b)
-       (set! res (cons (cons a b) res)))
-     db "SELECT id,action,owner,state,target,name,testpatt,keylock,params FROM tasks_queue 
+  (db:with-db
+   dbstruct
+   #f #f
+   (lambda (dbdat db)
+     (let ((res '()))
+       (sqlite3:for-each-row 
+	(lambda (a . b)
+	  (set! res (cons (cons a b) res)))
+	db "SELECT id,action,owner,state,target,name,testpatt,keylock,params FROM tasks_queue 
            WHERE
               target = ? AND name = ? AND state LIKE ? AND action LIKE ? AND testpatt LIKE ?;"
-     target run-name state-patt action-patt test-patt)
-    res)) ;; )
+	target run-name state-patt action-patt test-patt)
+       res))))
 
 ;; kill any runner processes (i.e. processes handling -runtests) that match target/runname
 ;; 
 ;; do a remote call to get the task queue info but do the killing as self here.
 ;;