From f599e467f3de219543cb6434314c1c5e0ce24f46 Mon Sep 17 00:00:00 2001 From: Simon Ser Date: Wed, 13 Jan 2021 17:51:59 +0100 Subject: [PATCH] Fix driverLess comparison --- walk.go | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/walk.go b/walk.go index d416559..133b0b1 100644 --- a/walk.go +++ b/walk.go @@ -38,12 +38,18 @@ func walkNodeProps(n *drmtree.Node, f func(drm.AnyID, string, *drmtree.Property) } func driverLess(a *drmtree.Driver, b *drmtree.Driver) bool { - if a.Version.Less(&b.Version) { - return true + if a.Version != b.Version { + return a.Version.Less(&b.Version) } - // Linux is the upstream - if b.Kernel.SysName == "Linux" && a.Kernel.SysName != "Linux" { - return true + if a.Kernel.SysName != b.Kernel.SysName { + // Linux is the upstream + if a.Kernel.SysName == "Linux" { + return false + } + if b.Kernel.SysName == "Linux" { + return true + } + return a.Kernel.SysName < b.Kernel.SysName } return version.Compare(a.Kernel.Release, b.Kernel.Release, "<") } -- 2.30.1