From 802393f25376ec4c56e2c6f8128e0c5a5f51bee6 Mon Sep 17 00:00:00 2001 From: Nathan LeClaire Date: Tue, 28 Jul 2015 16:17:53 -0700 Subject: [PATCH] Skip and warn on wonky /etc/os-release lines If the lines don't split cleanly (occasionally STDERR gets mixed in, for instance, due to our current SSH output setup), we should simply log.Warn in the output instead of bailing completely. Signed-off-by: Nathan LeClaire --- libmachine/provision/os_release.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libmachine/provision/os_release.go b/libmachine/provision/os_release.go index 9cc3d8e563..e10e1077fb 100644 --- a/libmachine/provision/os_release.go +++ b/libmachine/provision/os_release.go @@ -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)