toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #19033 from cr7pt0gr4ph7/19032-fix-native-execdriver-compile-error

Browse Source 
Fix declarations of of execdriver/native.NewDriver to have the same signature for all platforms
Upstream-commit: 0fff66977a5f4245aedc780acde319a587e945a7
Component: engine
This commit is contained in:
Brian Goff
2016-01-04 10:22:10 -05:00
parent 1162375d21 da10444c78
commit eee47109fa
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
components/engine/daemon/execdriver/native/driver_unsupported.go
View File

@ -9,6 +9,6 @@ import (
)
// NewDriver returns a new native driver, called from NewDriver of execdriver.
func NewDriver(root, initPath string) (execdriver.Driver, error) {
func NewDriver(root string, options []string) (execdriver.Driver, error) {
return nil, fmt.Errorf("native driver not supported on non-linux")
}

2
components/engine/daemon/execdriver/native/driver_unsupported_nocgo.go
View File

@ -9,6 +9,6 @@ import (
)
// NewDriver returns a new native driver, called from NewDriver of execdriver.
func NewDriver(root, initPath string) (execdriver.Driver, error) {
func NewDriver(root string, options []string) (execdriver.Driver, error) {
return nil, fmt.Errorf("native driver not supported on non-linux")
}