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

cliconfig: Do not rely on platform dependent code

Browse Source 
The 	`github.com/docker/docker/pkg/system` import was only being used to call to os.MkdirAll so it seems unnecessary to pull in all of system/* when this is all that is necessary.

Additionally, this was causing problems with attempting to vendor cliconfig using Godeps, as it would only vendor the necessary files based on the platform it's running on, this was seen when vendoring the package on a Mac, and then attempting to build on a Linux box due to `github.com/docker/docker/pkg/units/` not being properly included.

Signed-off-by: Chance Zibolski <chance@coreos.com>
Upstream-commit: 834f8b132b43b9075c08eb6186b888f7a224168f
Component: engine
This commit is contained in:
Chance Zibolski
2015-10-20 19:04:53 -07:00
committed by Chance Zibolski
parent 5c5f223189
commit 46e5ffa9f8
1 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
components/engine/cliconfig/config.go
+1 -2
View File
@@ -11,7 +11,6 @@ import (
"strings"
"github.com/docker/docker/pkg/homedir"
"github.com/docker/docker/pkg/system"
)
const (
@@ -228,7 +227,7 @@ func (configFile *ConfigFile) Save() error {
return fmt.Errorf("Can't save config with empty filename")
}
if err := system.MkdirAll(filepath.Dir(configFile.filename), 0700); err != nil {
if err := os.MkdirAll(filepath.Dir(configFile.filename), 0700); err != nil {
return err
}
f, err := os.OpenFile(configFile.filename, os.O_WRONLY|os.O_CREATE|os.O_TRUNC, 0600)