Index: common.scm
==================================================================
--- common.scm
+++ common.scm
@@ -513,37 +513,52 @@
 		)
 	      (if (> file-age (* (string->number (or (configf:lookup *configdat* "setup" "log-expire-days") "30")) 24 3600))
 		  (handle-exceptions
 		   exn
 		   #f
-		   (delete-file* fullname)
-		   (inc-stat "deleted")
+		   (if (directory? fullname)
+		       (begin
+			 (debug:print-error 0 *default-log-port* fullname " in logs directory is a directory! Cannot rotate it, it is best to not put subdirectories in the logs dir.")
+			 (inc-stat "directories"))
+		       (begin
+			 (delete-file* fullname)
+			 (inc-stat "deleted")))
 		   (hash-table-delete! all-files file)))))))
      '()
      "logs")
-    (debug:print-info 0 *default-log-port* "Deleted log files: " (hash-table-ref/default stats "deleted" 0))
-    (debug:print-info 0 *default-log-port* "Gzipped log files: " (hash-table-ref/default stats "gzipped" 0))    
+    (for-each
+     (lambda (category)
+       (let ((quant (hash-table-ref/default stats category 0)))
+	 (if (> quant 0)
+	     (debug:print-info 0 *default-log-port* category " log files: " quant))))
+     `("deleted" "gzipped" "directories"))
     (let ((num-logs (hash-table-size all-files)))
       (if (> num-logs max-allowed) ;; because NFS => don't let number of logs exceed 300
 	  (let ((files (take (sort (hash-table-keys all-files)
 				   (lambda (a b)
 				     (< (hash-table-ref all-files a)(hash-table-ref all-files b))))
 			     (- num-logs max-allowed))))
 	    (for-each
 	     (lambda (file)
-	       (delete-file* (conc "logs/" file)))
+	       (let* ((fullname (conc "logs/" file)))
+		 (if (directory? fullname)
+		     (debug:print-error 0 *default-log-port* fullname " in logs directory is a directory! Cannot rotate it, it is best to not put subdirectories in the logs dir.")
+		     (handle-exceptions
+		      exn
+		      (debug:print-error 0 *default-log-port* "failed to remove " fullname)
+		      (delete-file* fullname)))))
 	     files)
-	    (debug:print-info 0 *default-log-port* "Deleted " (length files) " from logs, keeping " max-allowed " files."))))))
+	    (debug:print-info 0 *default-log-port* "Deleted " (length files) " files from logs, keeping " max-allowed " files."))))))
   
 ;; 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:on-homehost?)
       (if (common:api-changed?)
 	  (let* ((mtconf (conc (get-environment-variable "MT_RUN_AREA_HOME") "/megatest.config"))
-                (dbfile (conc (get-environment-variable "MT_RUN_AREA_HOME") "/megatest.db"))
+                (dbfile  (conc (get-environment-variable "MT_RUN_AREA_HOME") "/megatest.db"))
                 (read-only (not (file-write-access? dbfile)))
                 (dbstruct (db:setup #t)))
 	    (debug:print 0 *default-log-port*
 			 "WARNING: Version mismatch!\n"
 			 "   expected: " (common:version-signature) "\n"