feat(ubuntu): Support Ubuntu 14.04 and 16.04 ESM (#1682)
* feat(ubuntu): Support Ubuntu ESM * Sort PackageFixStatuses to resolve the diff in integrationTest * go mod update gost
This commit is contained in:
		@@ -236,10 +236,13 @@ func (ps PackageFixStatuses) Store(pkg PackageFixStatus) PackageFixStatuses {
 | 
			
		||||
	return ps
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
// Sort by Name
 | 
			
		||||
// Sort by Name asc, FixedIn desc
 | 
			
		||||
func (ps PackageFixStatuses) Sort() {
 | 
			
		||||
	sort.Slice(ps, func(i, j int) bool {
 | 
			
		||||
		return ps[i].Name < ps[j].Name
 | 
			
		||||
		if ps[i].Name != ps[j].Name {
 | 
			
		||||
			return ps[i].Name < ps[j].Name
 | 
			
		||||
		}
 | 
			
		||||
		return ps[j].FixedIn < ps[i].FixedIn
 | 
			
		||||
	})
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
@@ -991,6 +991,28 @@ func TestSortPackageStatues(t *testing.T) {
 | 
			
		||||
				{Name: "b"},
 | 
			
		||||
			},
 | 
			
		||||
		},
 | 
			
		||||
		{
 | 
			
		||||
			in: PackageFixStatuses{
 | 
			
		||||
				{
 | 
			
		||||
					Name:    "libzstd1",
 | 
			
		||||
					FixedIn: "1.3.1+dfsg-1~ubuntu0.16.04.1+esm1",
 | 
			
		||||
				},
 | 
			
		||||
				{
 | 
			
		||||
					Name:    "libzstd1",
 | 
			
		||||
					FixedIn: "1.3.1+dfsg-1~ubuntu0.16.04.1+esm2",
 | 
			
		||||
				},
 | 
			
		||||
			},
 | 
			
		||||
			out: PackageFixStatuses{
 | 
			
		||||
				{
 | 
			
		||||
					Name:    "libzstd1",
 | 
			
		||||
					FixedIn: "1.3.1+dfsg-1~ubuntu0.16.04.1+esm2",
 | 
			
		||||
				},
 | 
			
		||||
				{
 | 
			
		||||
					Name:    "libzstd1",
 | 
			
		||||
					FixedIn: "1.3.1+dfsg-1~ubuntu0.16.04.1+esm1",
 | 
			
		||||
				},
 | 
			
		||||
			},
 | 
			
		||||
		},
 | 
			
		||||
	}
 | 
			
		||||
	for _, tt := range tests {
 | 
			
		||||
		tt.in.Sort()
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user