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

Merge pull request #11928 from crosbymichael/aufs-build-errors

Browse Source 
Fix AUFS logrus build errors on import
Upstream-commit: 446437d1a1b4d9f372768e954d36c4df64cc657e
Component: engine
This commit is contained in:
Michael Crosby
2015-03-30 11:49:14 -07:00
parent f45f722875 e54d4e4dac
commit 5cc2101a16
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
components/engine/daemon/graphdriver/aufs/aufs.go
View File

@ -480,14 +480,14 @@ func useDirperm() bool {
enableDirpermLock.Do(func() {
base, err := ioutil.TempDir("", "docker-aufs-base")
if err != nil {
log.Errorf("error checking dirperm1: %v", err)
logrus.Errorf("error checking dirperm1: %v", err)
return
}
defer os.RemoveAll(base)
union, err := ioutil.TempDir("", "docker-aufs-union")
if err != nil {
log.Errorf("error checking dirperm1: %v", err)
logrus.Errorf("error checking dirperm1: %v", err)
return
}
defer os.RemoveAll(union)
@ -498,7 +498,7 @@ func useDirperm() bool {
}
enableDirperm = true
if err := Unmount(union); err != nil {
log.Errorf("error checking dirperm1: failed to unmount %v", err)
logrus.Errorf("error checking dirperm1: failed to unmount %v", err)
}
})
return enableDirperm