0ct0pu5/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 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
This commit is contained in:
Brian Goff 2016-01-04 10:22:10 -05:00
commit 0fff66977a
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
daemon/execdriver/native/driver_unsupported.go
View file

@ -9,6 +9,6 @@ import (
) )
// NewDriver returns a new native driver, called from NewDriver of execdriver. // 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") return nil, fmt.Errorf("native driver not supported on non-linux")
} }

2
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. // 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") return nil, fmt.Errorf("native driver not supported on non-linux")
} }