@@ -185,13 +185,11 @@
 						partial-path-index)
 				     #f))
 	      ;; we need our archive dir checked for every test to enable folks who want to store other ways.
 	      (archive-info (archive:allocate-new-archive-block blockid-cache *toppath* tsname min-space target run-name test-name))
 	      (archive-dir  (if archive-info (cdr archive-info) #f))
-	      (archive-id   (if archive-info (car archive-info) -1))
-
-	      )
+	      (archive-id   (if archive-info (car archive-info) -1)))
 	 
 	 (if (not archive-dir) ;; no archive disk found, this is fatal
 	     (begin
 	       (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")
@@ -311,13 +309,18 @@
 	   ;; (mutex-unlock! bup-mutex)
 	   (for-each
 	    (lambda (test-dat)
 	      (let ((test-id           (db:test-get-id        test-dat))
 		    (run-id            (db:test-get-run_id    test-dat)))
+                 (debug:print-info 0 *default-log-port* "|"archive-command"|")
 		(rmt:test-set-archive-block-id run-id test-id archive-id)
-		(if (member archive-command '("save-remove"))
-		    (runs:remove-test-directory test-dat 'archive-remove))))
+                (debug:print-info 0 *default-log-port* "|"archive-command"|" (member (symbol->string archive-command) '("save-remove")) (string? archive-command))
+
+		(if (member (symbol->string archive-command) '("save-remove"))
+                    (begin 
+                     (debug:print-info 0 *default-log-port* "remove testdat")
+		    (runs:remove-test-directory test-dat 'archive-remove)))))
 	    (hash-table-ref test-groups test-base)))))
        (hash-table-keys disk-groups))
     #t))
 
 (define (archive:bup-restore archive-command run-id run-name tests rp-mutex bup-mutex)  ;; move the getting of archive space down into the below block so that a single run can