Index: common.scm
==================================================================
--- common.scm
+++ common.scm
@@ -278,14 +278,15 @@
                  (delete-file fullname)))))))
    '()
    "logs"))
 
 ;; Force a megatest cleanup-db if version is changed and skip-version-check not specified
+;; Do NOT check if not on homehost!
 ;;
 (define (common:exit-on-version-changed)
-  (if (common:version-changed?)
-      (if (common:on-homehost?)
+  (if (common:on-homehost?)
+      (if (common:version-changed?)
 	  (let* ((mtconf (conc (get-environment-variable "MT_RUN_AREA_HOME") "/megatest.config"))
                 (dbfile (conc (get-environment-variable "MT_RUN_AREA_HOME") "/megatest.db"))
                 (read-only (not (file-write-access? dbfile)))
                 (dbstruct (db:setup)))
 	    (debug:print 0 *default-log-port*
@@ -317,14 +318,14 @@
              (read-only
               (debug:print 0 *default-log-port* "   You have read-only access to this area.  Cannot proceed with megatest version migration.")
               (exit 1))
              (else
               (debug:print 0 *default-log-port* " to switch versions you can run: \"megatest -cleanup-db\"")
-              (exit 1))))
-	  (begin
-	    (debug:print 0 *default-log-port* "ERROR: cannot migrate version unless on homehost. Exiting.")
-	    (exit 1)))))
+              (exit 1)))))
+      (begin
+	(debug:print 0 *default-log-port* "ERROR: cannot migrate version unless on homehost. Exiting.")
+	(exit 1))))
 
 ;;======================================================================
 ;; S P A R S E   A R R A Y S
 ;;======================================================================
 
@@ -718,24 +719,23 @@
 	    (if (common:low-noise-print 30)
 		(debug:print-info 0 *default-log-port* "Exiting watchdog timer, *time-to-exit* = " *time-to-exit*" pid="(current-process-id)" this-wd-num="this-wd-num)))))))
 
 ;; TODO: for multiple areas, we will have multiple watchdogs; and multiple threads to manage
 (define (common:watchdog)
-  ;;#t)
   (debug:print-info 13 *default-log-port* "common:watchdog entered.")
-
- (let ((dbstruct (db:setup)))
-   (debug:print-info 13 *default-log-port* "after db:setup with dbstruct="dbstruct)
-   (cond
-    ((dbr:dbstruct-read-only dbstruct)
-     (debug:print-info 13 *default-log-port* "loading read-only watchdog")
-     (common:readonly-watchdog dbstruct))
-    (else
-     (debug:print-info 13 *default-log-port* "loading writable-watchdog.")
-     (common:writable-watchdog dbstruct))))
- (debug:print-info 13 *default-log-port* "watchdog done.");;)
- )
+  (if (common:on-homehost?)
+      (let ((dbstruct (db:setup)))
+	(debug:print-info 13 *default-log-port* "after db:setup with dbstruct="dbstruct)
+	(cond
+	 ((dbr:dbstruct-read-only dbstruct)
+	  (debug:print-info 13 *default-log-port* "loading read-only watchdog")
+	  (common:readonly-watchdog dbstruct))
+	 (else
+	  (debug:print-info 13 *default-log-port* "loading writable-watchdog.")
+	  (common:writable-watchdog dbstruct)))
+	(debug:print-info 13 *default-log-port* "watchdog done."))
+      (debug:print-info 13 *default-log-port* "no need for watchdog on non-homehost")))
 
 
 (define (std-exit-procedure)
   (on-exit (lambda () 0))
   ;;(debug:print-info 13 *default-log-port* "std-exit-procedure called; *time-to-exit*="*time-to-exit*)