1. docker
  2. Commit 88eec2e811d620fe88b4859dee64d064fae37356
Browse code

Also trim "~..." from AppArmor versions

Signed-off-by: Tianon Gravi <admwiggin@gmail.com>
(cherry picked from commit 654cad4d9dc4e87d72beb110032b61d4dfc963e4)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>

Tianon Gravi authored on 2020/10/09 07:39:52
Showing 2 changed files
pkg/aaparser/aaparser.go
History View file @ 88eec2e
... ... 
@@ -58,6 +58,8 @@ func parseVersion(output string) (int, error) {
58 58
59 59 
 	// trim "-beta1" suffix from version="3.0.0-beta1" if exists
60 60 
 	version = strings.SplitN(version, "-", 2)[0]
61 
+	// also trim "~..." suffix used historically (https://gitlab.com/apparmor/apparmor/-/commit/bca67d3d27d219d11ce8c9cc70612bd637f88c10)
62 
+	version = strings.SplitN(version, "~", 2)[0]
61 63
62 64 
 	// split by major minor version
63 65 
 	v := strings.Split(version, ".")
pkg/aaparser/aaparser_test.go
History View file @ 88eec2e
... ... 
@@ -44,6 +44,14 @@ Copyright 2009-2012 Canonical Ltd.
44 44 
 			version: 205000,
45 45 
 		},
46 46 
 		{
47 
+			output: `AppArmor parser version 2.2.0~rc2
48 
+Copyright (C) 1999-2008 Novell Inc.
49 
+Copyright 2009-2012 Canonical Ltd.
50 
+
51 
+`,
52 
+			version: 202000,
53 
+		},
54 
+		{
47 55 
 			output: `AppArmor parser version 2.9.95
48 56 
 Copyright (C) 1999-2008 Novell Inc.
49 57 
 Copyright 2009-2012 Canonical Ltd.