meta: Get rid of VersionMeta.Latest

NB that the action of resetting outstanding XSAs will be manual as of
this commit.

Signed-off-by: George Dunlap <george.dunlap@citrix.com>

diff --git a/global.go b/global.go
index c366ec3225706001106856bf170dc1cd5575ef47..a4d3ec86fd8ff99abaaeedacc2218b560bfdb833 100644 (file)
--- a/global.go
+++ b/global.go
@@ -39,7 +39,7 @@ func MainGlobalUpdate(unused *XSAMeta, args []string) int {
 
                sm.Versions = make(map[XenVersion]*VersionMeta)
 
-               sm.InitVersion(XenVersionFull("master"))
+               sm.InitVersion(XenVersion("master"))
 
                init = true
        }
@@ -52,19 +52,13 @@ func MainGlobalUpdate(unused *XSAMeta, args []string) int {
        }
 
        for _, fv := range versions {
-               vm, prs := sm.Versions[fv.XenVersion()]
+               _, prs := sm.Versions[fv.XenVersion()]
                if prs {
-                       if fv.Point() > vm.Latest.Point() {
-                               fmt.Printf("New version %v supercedes %v, discarding XSAs\n",
-                                       fv, vm.Latest)
-                               vm.Latest = fv
-                               ForEachCodeTree(func(t Tree) error {
-                                       vm.XSAs[t] = []int{}
-                                       return nil
-                               })
-                       }
-               } else if init && fv.XenVersion().IsGreaterEqualThan(limit) {
-                       sm.InitVersion(fv)
+                       continue
+               }
+
+               if init && fv.XenVersion().IsGreaterEqualThan(limit) {
+                       sm.InitVersion(fv.XenVersion())
                } else {
                        fmt.Printf("Skipping version %v\n", fv)
                }

diff --git a/meta.go b/meta.go
index a365eda6d1a51e02727d1666e23d305f3e4bd4b8..1d769ecfb4fefc8c96a0115d3f58594f9099c32b 100644 (file)
--- a/meta.go
+++ b/meta.go
@@ -167,8 +167,7 @@ func (tc ToolConfig) GetPath(t Tree) (s string) {
 }
 
 type VersionMeta struct {
-       Latest XenVersionFull
-       XSAs   map[Tree][]int
+       XSAs map[Tree][]int
 }
 
 type SecurityMeta struct {
@@ -216,16 +215,15 @@ func (sm *SecurityMeta) Save() (err error) {
        return
 }
 
-func (sm *SecurityMeta) InitVersion(fv XenVersionFull) *VersionMeta {
+func (sm *SecurityMeta) InitVersion(v XenVersion) *VersionMeta {
        var vm VersionMeta
 
        vm.XSAs = make(map[Tree][]int)
-       vm.Latest = fv
        ForEachCodeTree(func(t Tree) error {
                vm.XSAs[t] = []int{}
                return nil
        })
-       sm.Versions[fv.XenVersion()] = &vm
+       sm.Versions[v] = &vm
 
        return &vm
 }

diff --git a/systemtest.go b/systemtest.go
index fdf50aa2c80bed99a8c60ca14ae0e5beafda6018..469a3eb22ed0054f36e199b94de2cfe379606333 100644 (file)
--- a/systemtest.go
+++ b/systemtest.go
@@ -290,12 +290,12 @@ func GlobalInit(st *SystemTest) (pass bool) {
                fv   XenVersionFull
                seen bool
        }{
-               "master": {fv: "master"},
-               "4.8":    {fv: "4.8.0"},
-               "4.7":    {fv: "4.7.2"},
-               "4.6":    {fv: "4.6.5"},
-               "4.5":    {fv: "4.5.5"},
-               "4.4":    {fv: "4.4.4"},
+               "master": {},
+               "4.8":    {},
+               "4.7":    {},
+               "4.6":    {},
+               "4.5":    {},
+               "4.4":    {},
        }
 
        for v := range G.config.Security.Versions {
@@ -305,12 +305,6 @@ func GlobalInit(st *SystemTest) (pass bool) {
                        pass = false
                } else {
                        versions[v].seen = true
-                       if versions[v].fv != G.config.Security.Versions[v].Latest {
-                               st.Errorf("Expected fullversion %v, got %v\n",
-                                       versions[v].fv,
-                                       G.config.Security.Versions[v].Latest)
-                               pass = false
-                       }
                }
        }