beenull/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #39826 from secrethub/fix/get-os-version

Browse source 
Fix compiling pkg/parsers/operatingsystem on unix
This commit is contained in:
Sebastiaan van Stijn 2019-08-30 01:26:04 +02:00 committed by GitHub
commit d2ec6d0535
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
pkg/parsers/operatingsystem/operatingsystem_unix.go
View file

@ -4,7 +4,6 @@ package operatingsystem // import "github.com/docker/docker/pkg/parsers/operatin
import (
"errors"
"fmt"
"os/exec"
)
@ -21,7 +20,7 @@ func GetOperatingSystem() (string, error) {
// GetOperatingSystemVersion gets the version of the current operating system, as a string.
func GetOperatingSystemVersion() (string, error) {
// there's no standard unix way of getting this, sadly...
return "", fmt.Error("Unsupported on generic unix")
return "", errors.New("Unsupported on generic unix")
}
// IsContainerized returns true if we are running inside a container.