kotovalexarian-likes-github/moby--moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
Code Releases Activity

Merge pull request #41537 from tianon/apparmor-tilde

Browse source 
Also trim "~..." from AppArmor versions
This commit is contained in:
Akihiro Suda 2020-10-10 01:03:26 +09:00 • committed by GitHub
commit 9c15e82f19
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

2
pkg/aaparser/aaparser.go
View file

@ -58,6 +58,8 @@ func parseVersion(output string) (int, error) {
// trim "-beta1" suffix from version="3.0.0-beta1" if exists // trim "-beta1" suffix from version="3.0.0-beta1" if exists
version = strings.SplitN(version, "-", 2)[0] version = strings.SplitN(version, "-", 2)[0]
// also trim "~..." suffix used historically (https://gitlab.com/apparmor/apparmor/-/commit/bca67d3d27d219d11ce8c9cc70612bd637f88c10)
version = strings.SplitN(version, "~", 2)[0]
// split by major minor version // split by major minor version
v := strings.Split(version, ".") v := strings.Split(version, ".")

8
pkg/aaparser/aaparser_test.go
View file

@ -43,6 +43,14 @@ Copyright 2009-2012 Canonical Ltd.
`, `,
version: 205000, version: 205000,
}, },
{
output: `AppArmor parser version 2.2.0~rc2
Copyright (C) 1999-2008 Novell Inc.
Copyright 2009-2012 Canonical Ltd.
`,
version: 202000,
},
{ {
output: `AppArmor parser version 2.9.95 output: `AppArmor parser version 2.9.95
Copyright (C) 1999-2008 Novell Inc. Copyright (C) 1999-2008 Novell Inc.