oss/syft
2
0
Fork 0
mirror of https://github.com/anchore/syft.git synced 2025-11-18 08:53:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #85 from anchore/issue-84

Browse Source 
Remove carriage returns from distro files
This commit is contained in:
Alfredo Deza 2020-07-17 08:31:22 -04:00 committed by GitHub
commit f03f7b32e9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
imgbom/distro/identify.go
View File

@ -92,9 +92,9 @@ func parseOsRelease(contents string) *Distro {
switch prefix { switch prefix {
case "ID": case "ID":
id = value id = strings.TrimSpace(value)
case "VERSION_ID": case "VERSION_ID":
vers = value vers = strings.TrimSpace(value)
} }
} }

5
imgbom/distro/identify_test.go
View File

@ -34,6 +34,11 @@ func TestParseOsRelease(t *testing.T) {
name: "redhat", name: "redhat",
RawVersion: "8.1", RawVersion: "8.1",
}, },
{
fixture: "test-fixtures/unprintable",
name: "debian",
RawVersion: "8",
},
} }
for _, test := range tests { for _, test := range tests {

8
imgbom/distro/test-fixtures/unprintable Normal file
View File

@ -0,0 +1,8 @@
PRETTY_NAME="Debian GNU/Linux 8 (jessie)"
NAME="Debian GNU/Linux"
VERSION_ID="8"
VERSION="8 (jessie)"
ID=debian
HOME_URL="http://www.debian.org/"
SUPPORT_URL="http://www.debian.org/support"
BUG_REPORT_URL="https://bugs.debian.org/"