Merge pull request #1602 from nathanleclaire/skip_wonky_osrelease_lines

Skip and warn on wonky /etc/os-release lines
This commit is contained in:
Evan Hazlett 2015-07-29 11:51:53 -07:00
commit bf7eaf4b22
1 changed files with 2 additions and 1 deletions

View File

@ -69,7 +69,8 @@ func (osr *OsRelease) ParseOsRelease(osReleaseContents []byte) error {
for scanner.Scan() {
key, val, err := parseLine(scanner.Text())
if err != nil {
return err
log.Warn("Warning: got an invalid line error parsing /etc/os-release: %s", err)
continue
}
if err := osr.setIfPossible(key, val); err != nil {
log.Debug(err)