@@ -224,11 +224,11 @@
 			" as it is a toplevel test with children"))
 	  ((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*
+	   (debug:print 2 *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"
@@ -275,20 +275,32 @@
 						     )
 					       test-paths)))
 		(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)
+		      (debug:print-info 2 *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)
+		      (let-values (((pid-val exit-status exit-code) (run-n-wait bup-exe params: bup-init-params print-cmd: print-prefix)))
+                        (if (not (eq? exit-code 0))
+                              (begin    
+                              (debug:print-error 0 *default-log-port* "There was an error initializing bup. Archive failed.")
+                              (exit 1))))
 		      ;; (mutex-unlock! bup-mutex)
 		      ))
-		(debug:print-info 0 *default-log-port* "Indexing data to be archived")
+		(debug:print-info 2 *default-log-port* "Indexing data to be archived")
 		;; (mutex-lock! bup-mutex)
-		(run-n-wait bup-exe params: bup-index-params print-cmd: print-prefix)
-		(debug:print-info 0 *default-log-port* "Archiving data with bup")
-		(run-n-wait bup-exe params: bup-save-params print-cmd: print-prefix)))
+		(let-values (((pid-val exit-status exit-code) (run-n-wait bup-exe params: bup-index-params print-cmd: print-prefix)))
+                   (if (not (eq? exit-code 0))
+                              (begin    
+                              (debug:print-error 0 *default-log-port* "There was an error Indexing bup. Archive failed.")
+                              (exit 1))))
+		(debug:print-info 2 *default-log-port* "Archiving data with bup")
+		(let-values (((pid-val exit-status exit-code) (run-n-wait bup-exe params: bup-save-params print-cmd: print-prefix)))
+                     (if (not (eq? exit-code 0))
+                              (begin    
+                              (debug:print-error 0 *default-log-port* "There was an archiving data with bup. Archive failed.")
+                              (exit 1))))))
 	     ((7z tar)
 	      (for-each
 	       (lambda (test-dat)
 		 (let* ((test-id           (db:test-get-id        test-dat))
 			(test-name         (db:test-get-testname  test-dat))
@@ -354,16 +366,29 @@
 						     (conc "--strip-path=" archive-staging-db ) ;; if we push to the directory do we need this?
 						     dbfile)))
                     (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)
-		        (run-n-wait bup-exe params: bup-init-params print-cmd: print-prefix)))
-		     (debug:print-info 0 *default-log-port* "Indexing data to be archived")
-		     (run-n-wait bup-exe params: bup-index-params print-cmd: print-prefix)
-		     (debug:print-info 0 *default-log-port* "Archiving data with bup")
-		     (run-n-wait bup-exe params: bup-save-params print-cmd: print-prefix)))
+		        (debug:print-info 2 *default-log-port* "Init bup in " archive-dir)
+		         (let-values (((pid-val exit-status exit-code)(run-n-wait bup-exe params: bup-init-params print-cmd: print-prefix)))
+                          (if (not (eq? exit-code 0))
+                              (begin    
+                              (debug:print-error 0 *default-log-port* "There was an error initializing bup. Archive failed.")
+                              (exit 1))))))
+		     (debug:print-info 2 *default-log-port* "Indexing data to be archived")
+		     (let-values (((pid-val exit-status exit-code) (run-n-wait bup-exe params: bup-index-params print-cmd: print-prefix)))
+                        (if (not (eq? exit-code 0))
+                              (begin    
+                              (debug:print-error 0 *default-log-port* "There was an error Indexing bup. Archive failed.")
+                              (exit 1))))
+		     (debug:print-info 2 *default-log-port* "Archiving data with bup")
+		     (let-values (((pid-val exit-status exit-code) (run-n-wait bup-exe params: bup-save-params print-cmd: print-prefix)))
+                         (if (not (eq? exit-code 0))
+                              (begin    
+                              (debug:print-error 0 *default-log-port* "There was an error archiving data with bup. Archive failed.")
+                              (exit 1))
+                             (debug:print-info 2 *default-log-port* "To restore megatest.db run megatest -archive replicacte-db -source archive-dir -time-stamp <ts>. Current timestamp: " (seconds->std-time-str (current-seconds))))))) 
                (else
                    (debug:print-info 0 *default-log-port* "No support for databse archiving with " archiver)))
                (debug:print-error 0 *default-log-port* "There was an error rsyncing tmp database")))))
 
 (define (archive:restore-db archive-path ts)