Index: archive.scm
==================================================================
--- archive.scm
+++ archive.scm
@@ -90,11 +90,11 @@
 	       (pscript-cmd (conc pscript " " testsuite-name " " target " " run-name " " test-name))
 	       (apath       (if pscript
 				(handle-exceptions
 				 exn
 				 (begin
-				   (debug:print 0 *current-log-port* "ERROR: script \"" pscript-cmd "\" failed to run properly.")
+				   (debug:print 0 *default-log-port* "ERROR: script \"" pscript-cmd "\" failed to run properly.")
 				   (exit 1))
 				 (with-input-from-pipe
 				  pscript-cmd
 				  read-line))
 				#f)) ;; this is the user-calculated archive path
@@ -117,14 +117,14 @@
 		(if block-id ;; (and block-id allocation-id)
 		    (let ((res (cons block-id archive-path)))
 		      (hash-table-set! blockid-cache key res)
 		      res)
 		    (begin
-		      (debug:print 0 *current-log-port* "WARNING: no disk found for " target ", " run-name ", " test-name ", block-id=" block-id)
+		      (debug:print 0 *default-log-port* "WARNING: no disk found for " target ", " run-name ", " test-name ",  archive-path=" archive-path)
 		      #f)))
 	      (begin
-		(debug:print 0 *current-log-port* "WARNING: no disk found for " target ", " run-name ", " test-name ", block-id=" block-id)
+		(debug:print 0 *default-log-port* "WARNING: no disk found for " target ", " run-name ", " test-name ", block-id=" block-id)
 		#f)))))) ;; no best disk found
 
 ;; archive - run bup
 ;;
 ;; 1. create the bup dir if not exists

Index: db.scm
==================================================================
--- db.scm
+++ db.scm
@@ -1464,20 +1464,18 @@
        (set! res id))
      db
      "SELECT id FROM archive_blocks WHERE archive_disk_id=? AND disk_path=?;"
      bdisk-id archive-path)
     (if res ;; record exists, update du if applicable and return res
-	(begin
-	  (if du (sqlite3:execute db "UPDATE archive_blocks SET last_du=?,last_du_time=(strftime('%s','now'))
+	(if du (sqlite3:execute db "UPDATE archive_blocks SET last_du=?,last_du_time=(strftime('%s','now'))
                                           WHERE archive_disk_id=? AND disk_path=?;"
-				   bdisk-id archive-path du))
-	  res)
+				bdisk-id archive-path du))
 	(begin
 	  (sqlite3:execute db "INSERT OR REPLACE INTO archive_blocks (archive_disk_id,disk_path,last_du)
                                                         VALUES (?,?,?);"
 			   bdisk-id archive-path (or du 0))
-	  (db:archive-register-block-name dbstruct bdisk-id archive-path du: du)))
+	  (set! res (db:archive-register-block-name dbstruct bdisk-id archive-path du: du))))
     (stack-push! (dbr:dbstruct-dbstack dbstruct) dbdat)
     res))
 
 
 ;; The "archived" field in tests is overloaded; 0 = not archived, > 0 archived in block with given id