Index: dbmod.scm
==================================================================
--- dbmod.scm
+++ dbmod.scm
@@ -508,11 +508,11 @@
 	  ;; done
 	  (debug:print 2 *default-log-port* "Attaching "destdbfile" as auxdb")
 	  (handle-exceptions
 	      exn
 	      (begin
-		(debug:print 0 "ATTACH failed, exiting. exn="(condition->list exn))
+		(debug:print 0 *default-log-port* "ATTACH failed, exiting. exn="(condition->list exn))
 		(exit 1))
 	    (sqlite3:execute dbh (conc "ATTACH '"destdbfile"' AS auxdb;")))
 	  (for-each
 	   (lambda (table)
 	     (let* ((dummy (debug:print 2 *default-log-port* "Doing table " table))

Index: tcp-transportmod.scm
==================================================================
--- tcp-transportmod.scm
+++ tcp-transportmod.scm
@@ -532,11 +532,12 @@
 			   (result    '()))
 		  (if (null? servrs)
 		      (reverse result)
 		      (let* ((servdat (car servrs)))
 			(match servdat
-			     ((host port startseconds server-id servinfofile)
+			     ((host port startseconds server-id pid dbfilename servinfofile)
+                              (debug:print-info 0 *default-log-port* "Good servinfo file: " servdat)
 			      (let* ((ping-res  (tt:timed-ping host port server-id))
 				     (good-ping (match ping-res
 						   ((result . ping-time)
 						    (not result)) ;; we couldn't reach the server or it was not a megatest server
 						   (else #f))) ;; the ping failed completely?
@@ -546,10 +547,11 @@
 				(if keep-srv	
 				    (loop (cdr servrs)
 					  host
 					  (cons servdat result))
 				    (begin
+                                      ;; (debug:print-info 0 *default-log-port* "good-ping: " good-ping " same-host: " same-host "keep-srv: " keep-srv)
 				      (handle-exceptions
 				       exn
 				       (debug:print-info 0 *default-log-port* "Error removing server info file: "servinfofile", "
 							 (condition->list exn))
 				       (delete-file* servinfofile))