Index: dashboard.scm
==================================================================
--- dashboard.scm
+++ dashboard.scm
@@ -1,7 +1,7 @@
 ;;======================================================================
-;; Copyright 2006-2012, Matthew Welland.
+;; Copyright 2006-2016, Matthew Welland.
 ;; 
 ;;  This program is made available under the GNU GPL version 2.0 or
 ;;  greater. See the accompanying file COPYING for details.
 ;; 
 ;;  This program is distributed WITHOUT ANY WARRANTY; without even the
@@ -43,11 +43,11 @@
 (include "megatest-fossil-hash.scm")
 
 (define help (conc 
 "Megatest Dashboard, documentation at http://www.kiatoa.com/fossils/megatest
   version " megatest-version "
-  license GPL, Copyright (C) Matt Welland 2012-2014
+  license GPL, Copyright (C) Matt Welland 2012-2016
 
 Usage: dashboard [options]
   -h                   : this help
   -server host:port    : connect to host:port instead of db access
   -test run-id,test-id : control test identified by testid

Index: datashare-testing/.sretrieve.config
==================================================================
--- datashare-testing/.sretrieve.config
+++ datashare-testing/.sretrieve.config
@@ -1,17 +1,8 @@
 [settings]
-base-dir      /tmp/pjhatwal/datashare/disk1
+base-dir      /tmp/delme_data
 allowed-users matt mrwellan pjhatwal
 allowed-chars [0-9a-zA-Z\-\.]+
-default-area  megatest
-
-# NOTE: packages-metadir defaults to exe dir if not specified here
-# packages-metadir  /tmp/#{getenv USER}/packages
-
-# conversion-script has semantics as cp, takes file1 and outputs file2
-#   cp file1 file2
-conversion-script cp
-upstream-file     packages.config
 
 [database]
 location #{scheme (create-directory "/tmp/#{getenv USER}" #t)}
 

Index: sretrieve.scm
==================================================================
--- sretrieve.scm
+++ sretrieve.scm
@@ -49,12 +49,11 @@
 (define *sretrieve:current-tab-number* 0)
 (define *args-hash* (make-hash-table))
 (define sretrieve:help (conc "Usage: sretrieve [action [params ...]]
 
   ls                     : list contents of target area
-  get <version>          : retrieve data for <version>
-    -i iteration_num       get specific iteration
+  get <relversion>       : retrieve data for release <version>
     -m \"message\"       : why retrieved?
 
   log                    : get listing of recent downloads
 
 Part of the Megatest tool suite.
@@ -133,24 +132,22 @@
 	      (proc db)))))
 	(debug:print 0 "ERROR: invalid path for storing database: " path))))
 
 ;; copy in file to dest, validation is done BEFORE calling this
 ;;
-(define (sretrieve:get configdat reldat retriever area version iter comment)
-  (let* ((iteration (or iter
-			(configf:lookup reldat version "iteration")))
-	 (base-dir  (configf:lookup configdat "settings" "base-dir"))
-	 (datadir   (conc base-dir "/" area "/" version "/" iteration)))
+(define (sretrieve:get configdat retriever version comment)
+  (let* ((base-dir  (configf:lookup configdat "settings" "base-dir"))
+	 (datadir   (conc base-dir "/" version)))
     (if (or (not base-dir)
 	    (not (file-exists? base-dir)))
 	(begin
 	  (debug:print 0 "ERROR: Bad configuration! base-dir " base-dir " not found")
 	  (exit 1)))
     (print datadir)
     (if (not (file-exists? datadir))
 	(begin
-	  (debug:print 0 "ERROR: Bad version (" version ") or iteration (" iteration "), no data found at " datadir "." )
+	  (debug:print 0 "ERROR: Bad version (" version "), no data found at " datadir "." )
 	  (exit 1)))
     
     (sretrieve:db-do
      configdat
      (lambda (db)
@@ -337,12 +334,11 @@
 
 ;; package-type is "megatest", "builds", "kits" etc.
 ;;
 (define (sretrieve:load-packages configdat exe-dir package-type)
   (push-directory exe-dir)
-  (let* ((packages-metadir  (or (configf:lookup configdat "settings" "packages-metadir")
-				".")) ;; exe-dir))
+  (let* ((packages-metadir  (configf:lookup configdat "settings" "packages-metadir"))
 	 (conversion-script (configf:lookup configdat "settings" "conversion-script"))
 	 (upstream-file     (configf:lookup configdat "settings" "upstream-file"))
 	 (package-config    (conc packages-metadir "/" package-type ".config")))
     ;; this section here does a timestamp based rebuild of the
     ;;   <packages-metadir>/<package-type>.config file using
@@ -394,18 +390,17 @@
 	     (debug:print 0 "ERROR: Missing arguments; " (string-intersperse args ", "))
 	     (exit 1)))
        (let* ((remargs     (args:get-args args '("-m" "-i" "-package") '() args:arg-hash 0))
               (version     (car args))
 	      (msg         (or (args:get-arg "-m") ""))
-	      (iteration   (args:get-arg "-i"))
 	      (package-type (or (args:get-arg "-package")
 				default-area))
-	      (exe-dir     (configf:lookup configdat "exe-info" "exe-dir"))
-	      (relconfig   (sretrieve:load-packages configdat exe-dir package-type)))
+	      (exe-dir     (configf:lookup configdat "exe-info" "exe-dir")))
+;;	      (relconfig   (sretrieve:load-packages configdat exe-dir package-type)))
 
 	 (debug:print 0 "retrieving " version " of " package-type " as tar data on stdout")
-	 (sretrieve:get configdat relconfig user package-type version iteration msg)))
+	 (sretrieve:get configdat user version msg)))
       (else (debug:print 0 "Unrecognised command " action)))))
   
 ;; ease debugging by loading ~/.dashboardrc - REMOVE FROM PRODUCTION!
 ;; (let ((debugcontrolf (conc (get-environment-variable "HOME") "/.sretrieverc")))
 ;;   (if (file-exists? debugcontrolf)
@@ -429,13 +424,16 @@
 	((help -h -help --h --help)
 	 (print sretrieve:help))
 	((list-vars) ;; print out the ini file
 	 (map print (sretrieve:get-areas configdat)))
 	((ls)
-	 (let ((target-dir (configf:lookup configdat "settings" "target-dir")))
-	   (print "Files in " target-dir)
-	   (system (conc "ls " target-dir))))
+	 (let* ((base-dir (configf:lookup configdat "settings" "base-dir")))
+	   (if base-dir
+	       (begin
+		 (print "Files in " base-dir)
+		 (system (conc "ls " base-dir)))
+	       (print "ERROR: No base dir specified!"))))
 	((log)
 	 (sretrieve:db-do configdat (lambda (db)
 				     (print "Listing actions")
 				     (query (for-each-row
 					     (lambda (row)