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

Merge pull request #15146 from kolyshkin/mkdirall

Browse source 
Simplify and fix MkdirAll usage
This commit is contained in:
Tibor Vass 2015-07-30 22:40:57 -04:00
commit 8d2739df98
9 changed files with 15 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
daemon/daemon.go
View file

@ -582,7 +582,7 @@ func NewDaemon(config *Config, registryService *registry.Service) (daemon *Daemo
}
config.Root = realRoot
// Create the root directory if it doesn't exists
if err := system.MkdirAll(config.Root, 0700); err != nil && !os.IsExist(err) {
if err := system.MkdirAll(config.Root, 0700); err != nil {
return nil, err
}
@ -634,7 +634,7 @@ func NewDaemon(config *Config, registryService *registry.Service) (daemon *Daemo
daemonRepo := filepath.Join(config.Root, "containers")
if err := system.MkdirAll(daemonRepo, 0700); err != nil && !os.IsExist(err) {
if err := system.MkdirAll(daemonRepo, 0700); err != nil {
return nil, err
}
@ -661,7 +661,7 @@ func NewDaemon(config *Config, registryService *registry.Service) (daemon *Daemo
trustDir := filepath.Join(config.Root, "trust")
if err := system.MkdirAll(trustDir, 0700); err != nil && !os.IsExist(err) {
if err := system.MkdirAll(trustDir, 0700); err != nil {
return nil, err
}
trustService, err := trust.NewTrustStore(trustDir)

8
daemon/graphdriver/aufs/aufs.go
View file

@ -104,13 +104,8 @@ func Init(root string, options []string) (graphdriver.Driver, error) {
active: make(map[string]int),
}
// Create the root aufs driver dir and return
// if it already exists
// If not populate the dir structure
// Create the root aufs driver dir
if err := os.MkdirAll(root, 0755); err != nil {
if os.IsExist(err) {
return a, nil
}
return nil, err
}
@ -118,6 +113,7 @@ func Init(root string, options []string) (graphdriver.Driver, error) {
return nil, err
}
// Populate the dir structure
for _, p := range paths {
if err := os.MkdirAll(path.Join(root, p), 0755); err != nil {
return nil, err

4
daemon/graphdriver/devmapper/deviceset.go
View file

@ -238,7 +238,7 @@ func (devices *DeviceSet) ensureImage(name string, size int64) (string, error) {
dirname := devices.loopbackDir()
filename := path.Join(dirname, name)
if err := os.MkdirAll(dirname, 0700); err != nil && !os.IsExist(err) {
if err := os.MkdirAll(dirname, 0700); err != nil {
return "", err
}
@ -1260,7 +1260,7 @@ func (devices *DeviceSet) initDevmapper(doInit bool) error {
logrus.Warn("Udev sync is not supported. This will lead to unexpected behavior, data loss and errors. For more information, see https://docs.docker.com/reference/commandline/cli/#daemon-storage-driver-option")
}
if err := os.MkdirAll(devices.metadataDir(), 0700); err != nil && !os.IsExist(err) {
if err := os.MkdirAll(devices.metadataDir(), 0700); err != nil {
return err
}

4
daemon/graphdriver/devmapper/driver.go
View file

@ -159,7 +159,7 @@ func (d *Driver) Get(id, mountLabel string) (string, error) {
mp := path.Join(d.home, "mnt", id)
// Create the target directories if they don't exist
if err := os.MkdirAll(mp, 0755); err != nil && !os.IsExist(err) {
if err := os.MkdirAll(mp, 0755); err != nil {
return "", err
}
@ -169,7 +169,7 @@ func (d *Driver) Get(id, mountLabel string) (string, error) {
}
rootFs := path.Join(mp, "rootfs")
if err := os.MkdirAll(rootFs, 0755); err != nil && !os.IsExist(err) {
if err := os.MkdirAll(rootFs, 0755); err != nil {
d.DeviceSet.UnmountDevice(id)
return "", err
}

2
daemon/graphdriver/overlay/overlay.go
View file

@ -124,7 +124,7 @@ func Init(home string, options []string) (graphdriver.Driver, error) {
}
// Create the driver home dir
if err := os.MkdirAll(home, 0755); err != nil && !os.IsExist(err) {
if err := os.MkdirAll(home, 0755); err != nil {
return nil, err
}

2
daemon/graphdriver/zfs/zfs.go
View file

@ -280,7 +280,7 @@ func (d *Driver) Get(id, mountLabel string) (string, error) {
logrus.Debugf(`[zfs] mount("%s", "%s", "%s")`, filesystem, mountpoint, options)
// Create the target directories if they don't exist
if err := os.MkdirAll(mountpoint, 0755); err != nil && !os.IsExist(err) {
if err := os.MkdirAll(mountpoint, 0755); err != nil {
return "", err
}

2
graph/graph.go
View file

@ -107,7 +107,7 @@ func NewGraph(root string, driver graphdriver.Driver) (*Graph, error) {
return nil, err
}
// Create the root directory if it doesn't exists
if err := system.MkdirAll(root, 0700); err != nil && !os.IsExist(err) {
if err := system.MkdirAll(root, 0700); err != nil {
return nil, err
}

2
integration-cli/docker_utils.go
View file

@ -1187,7 +1187,7 @@ func newFakeGit(name string, files map[string]string, enforceLocalServer bool) (
// Call c.Fatal() at the first error.
func writeFile(dst, content string, c *check.C) {
// Create subdirectories if necessary
if err := os.MkdirAll(path.Dir(dst), 0700); err != nil && !os.IsExist(err) {
if err := os.MkdirAll(path.Dir(dst), 0700); err != nil {
c.Fatal(err)
}
f, err := os.OpenFile(dst, os.O_CREATE|os.O_RDWR|os.O_TRUNC, 0700)

4
pkg/archive/archive.go
View file

@ -720,7 +720,7 @@ func (archiver *Archiver) CopyWithTar(src, dst string) error {
}
// Create dst, copy src's content into it
logrus.Debugf("Creating dest directory: %s", dst)
if err := system.MkdirAll(dst, 0755); err != nil && !os.IsExist(err) {
if err := system.MkdirAll(dst, 0755); err != nil {
return err
}
logrus.Debugf("Calling TarUntar(%s, %s)", src, dst)
@ -752,7 +752,7 @@ func (archiver *Archiver) CopyFileWithTar(src, dst string) (err error) {
dst = filepath.Join(dst, filepath.Base(src))
}
// Create the holding directory if necessary
if err := system.MkdirAll(filepath.Dir(dst), 0700); err != nil && !os.IsExist(err) {
if err := system.MkdirAll(filepath.Dir(dst), 0700); err != nil {
return err
}