@@ -115,13 +115,13 @@
 	 (compress     (or (configf:lookup *configdat* "archive" "compress") "9"))
 	 (linktree     (configf:lookup *configdat* "setup" "linktree")))
 
     (if (not archive-dir) ;; no archive disk found, this is fatal
 	(begin
-	  (debug:print 0 #f "FATAL: No archive disks found. Please add disks with at least " min-space " MB space to the [archive-disks] section of megatest.config")
-	  (debug:print 0 #f "       use [archive] minspace to specify minimum available space")
-	  (debug:print 0 #f "   disks: " (string-intersperse (map cadr (archive:get-archive-disks)) "\n         "))
+	  (debug:print 0 *default-log-port* "FATAL: No archive disks found. Please add disks with at least " min-space " MB space to the [archive-disks] section of megatest.config")
+	  (debug:print 0 *default-log-port* "       use [archive] minspace to specify minimum available space")
+	  (debug:print 0 *default-log-port* "   disks: " (string-intersperse (map cadr (archive:get-archive-disks)) "\n         "))
 	  (exit 1))
 	(debug:print-info 0 #f "Using path " archive-dir " for archiving"))
 
     ;; from the test info bin the path to the test by stem
     ;;
@@ -151,15 +151,15 @@
 						partial-path-index)
 				     #f)))
 	 
  	 (cond
 	  (toplevel/children
-	   (debug:print 0 #f "WARNING: cannot archive " test-name " with id " test-id " as it is a toplevel test with children"))
+	   (debug:print 0 *default-log-port* "WARNING: cannot archive " test-name " with id " test-id " as it is a toplevel test with children"))
 	  ((not (file-exists? test-path))
-	   (debug:print 0 #f "WARNING: Cannot archive " test-name "/" item-path " as path " test-path " does not exist"))
+	   (debug:print 0 *default-log-port* "WARNING: Cannot archive " test-name "/" item-path " as path " test-path " does not exist"))
 	  (else
-	   (debug:print 0 #f
+	   (debug:print 0 *default-log-port*
 			"From test-dat=" test-dat " derived the following:\n"
 			"test-partial-path  = " test-partial-path "\n"
 			"test-path          = " test-path "\n"
 			"test-physical-path = " test-physical-path "\n"
 			"partial-path-index = " partial-path-index "\n"
@@ -169,11 +169,11 @@
 	   test-path))))
      tests)
     ;; for each disk-group
     (for-each 
      (lambda (disk-group)
-       (debug:print 0 #f "Processing disk-group " disk-group)
+       (debug:print 0 *default-log-port* "Processing disk-group " disk-group)
        (let* ((test-paths (hash-table-ref disk-groups disk-group))
 	      ;; ((string-intersperse (map cadr (rmt:get-key-val-pairs 1)) "-")
 	      (bup-init-params  (list "-d" archive-dir "init"))
 	      (bup-index-params (append (list "-d" archive-dir "index") test-paths))
 	      (bup-save-params  (append (list "-d" archive-dir "save" ;; (conc "--strip-path=" linktree)
@@ -254,11 +254,11 @@
 		  prev-test-physical-path
 		  (file-exists? prev-test-physical-path)) ;; what to do? abort or clean up or link it in?
 	     (let* ((base (pathname-directory prev-test-physical-path))
 		    (dirn (pathname-file      prev-test-physical-path))
 		    (newn (conc base "/." dirn)))
-	       (debug:print 0 #f "ERROR: the old directory " prev-test-physical-path ", still exists! Moving it to " newn)
+	       (debug:print 0 *default-log-port* "ERROR: the old directory " prev-test-physical-path ", still exists! Moving it to " newn)
 	       (rename-file prev-test-physical-path newn)))
 
 	 (if (and archive-path ;; no point in proceeding if there is no actual archive
 		  (not toplevel/children))
 	     (begin
@@ -276,17 +276,17 @@
 	       ;; DO BUP RESTORE
 	       (let* ((new-test-dat        (rmt:get-test-info-by-id run-id test-id))
 		      (new-test-path       (if (vector? new-test-dat )
 					       (db:test-get-rundir new-test-dat)
 					       (begin
-						 (debug:print 0 #f "ERROR: unable to get data for run-id=" run-id ", test-id=" test-id)
+						 (debug:print 0 *default-log-port* "ERROR: unable to get data for run-id=" run-id ", test-id=" test-id)
 						 (exit 1))))
 		      ;; new-test-path won't work - must use best-disk instead? Nope, new-test-path but tack on /..
 		      (bup-restore-params  (list "-d" archive-path "restore" "-C" (conc new-test-path "/..") archive-internal-path)))
 		 (debug:print-info 0 #f "Restoring archived data to " new-test-physical-path " from archive in " archive-path " ... " archive-internal-path)
 		 ;; (mutex-lock! bup-mutex)
 		 (run-n-wait bup-exe params: bup-restore-params print-cmd: #f)
 		 ;; (mutex-unlock! bup-mutex)
 		 (mt:test-set-state-status-by-id run-id test-id "COMPLETED" #f #f)))
-	     (debug:print 0 #f "ERROR: No archive path in the record for run-id=" run-id " test-id=" test-id))))
+	     (debug:print 0 *default-log-port* "ERROR: No archive path in the record for run-id=" run-id " test-id=" test-id))))
      (filter vector? tests))))