@@ -30,11 +30,11 @@
 	(flavor  'plain) ;; type of machine to run jobs on
 	(maxload 1.5)   ;; max allowed load for this work
 	(adisks  (archive:get-archive-disks)))
     ;; get testdir size
     ;;   - hand off du to job mgr
-    (if (and (file-exists? testdir)
+    (if (and (common:file-exists? testdir)
 	     (file-is-writable? testdir))
 	(let* ((dused  (jobrunner:run-job 
 			flavor  ;; machine type
 			maxload ;; max allowed load
 			'()     ;; prevars - environment vars to set for the job
@@ -137,11 +137,11 @@
 				      (> (rmt:test-toplevel-num-items run-id test-name) 0)))
 	      (test-partial-path (conc target "/" run-name "/" (db:test-make-full-name test-name item-path)))
 	      ;; note the trailing slash to get the dir inspite of it being a link
 	      (test-path         (conc linktree "/" test-partial-path))
 	      (mutex-lock! rp-mutex)
-	      (test-physical-path (if (file-exists? test-path) 
+	      (test-physical-path (if (common:file-exists? test-path) 
 				      (common:real-path test-path)
 				      #f))
 	      (mutex-unlock! rp-mutex)
 	      (partial-path-index (if test-physical-path (substring-index test-partial-path test-physical-path) #f))
 	      (test-base         (if (and partial-path-index 
@@ -152,11 +152,11 @@
 				     #f)))
 	 
  	 (cond
 	  (toplevel/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))
+	  ((not (common:file-exists? test-path))
 	   (debug:print 0 *default-log-port* "WARNING: Cannot archive " test-name "/" item-path " as path " test-path " does not exist"))
 	  (else
 	   (debug:print 0 *default-log-port*
 			"From test-dat=" test-dat " derived the following:\n"
 			"test-partial-path  = " test-partial-path "\n"
@@ -180,13 +180,13 @@
 					      (conc "-" compress) ;; or (conc "--compress=" compress)
 					      "-n" (conc (common:get-testsuite-name) "-" run-id)
 					      (conc "--strip-path=" disk-group))
 					test-paths))
 	      (print-prefix      #f)) ;; "Running: ")) ;; change to #f to turn off printing
-	 (if (not (file-exists? archive-dir))
+	 (if (not (common:file-exists? archive-dir))
 	     (create-directory archive-dir #t))
-	 (if (not (file-exists? (conc archive-dir "/HEAD")))
+	 (if (not (common:file-exists? (conc archive-dir "/HEAD")))
 	     (begin
 	       ;; replace this with jobrunner stuff enventually
 	       (debug:print-info 0 *default-log-port* "Init bup in " archive-dir)
 	       ;; (mutex-lock! bup-mutex)
 	       (run-n-wait bup-exe params: bup-init-params print-cmd: print-prefix)
@@ -233,11 +233,11 @@
 	      (test-partial-path (conc target "/" run-name "/" (db:test-make-full-name test-name item-path)))
 	      ;; note the trailing slash to get the dir inspite of it being a link
 	      (test-path         (conc linktree "/" test-partial-path))
 	      ;; if the old path was not deleted then prev-test-physical-path will end up pointing to a real directory
 	      (mutex-lock! rp-mutex)
-	      (prev-test-physical-path (if (file-exists? test-path)
+	      (prev-test-physical-path (if (common:file-exists? test-path)
 					   ;; (read-symbolic-link test-path #t)
 					   (common:real-path test-path)
 					   #f))
 	      (mutex-unlock! rp-mutex)
 	      (new-test-physical-path  (conc best-disk "/" test-partial-path))
@@ -250,11 +250,11 @@
 	 
 	 ;; some sanity checks, move an existing path out of the way - iif it is not a toplevel with children
 	 ;;
 	 (if (and (not toplevel/children)  ;; special handling needed for toplevel with children
 		  prev-test-physical-path
-		  (file-exists? prev-test-physical-path)) ;; what to do? abort or clean up or link it in?
+		  (common: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-error 0 *default-log-port* "the old directory " prev-test-physical-path ", still exists! Moving it to " newn)
 	       (rename-file prev-test-physical-path newn)))