sys: mkdirAs: do chown if dir already exists

AkihiroSuda · AkihiroSuda · commit 62adc516ddfa · 2019-12-18T14:19:19.000+09:00
Fix `buildkitd --group GROUP` issue when `/run/buildkit` already exists
and is owned by the root.

Signed-off-by: Akihiro Suda &lt;akihiro.suda.cz@hco.ntt.co.jp&gt;
diff --git a/sys/socket_unix.go b/sys/socket_unix.go
@@ -68,11 +68,11 @@ func GetLocalListener(path string, uid, gid int) (net.Listener, error) {
 }
 
 func mkdirAs(path string, uid, gid int) error {
-	if _, err := os.Stat(path); err == nil || !os.IsNotExist(err) {
+	if _, err := os.Stat(path); !os.IsNotExist(err) {
 		return err
 	}
 
-	if err := os.Mkdir(path, 0770); err != nil {
+	if err := os.MkdirAll(path, 0770); err != nil {
 		return err
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -68,11 +68,11 @@ func GetLocalListener(path string, uid, gid int) (net.Listener, error) {`
`68`	`68`	`}`
`69`	`69`
`70`	`70`	`func mkdirAs(path string, uid, gid int) error {`
`71`		`- if _, err := os.Stat(path); err == nil \|\| !os.IsNotExist(err) {`
	`71`	`+ if _, err := os.Stat(path); !os.IsNotExist(err) {`
`72`	`72`	`return err`
`73`	`73`	`}`
`74`	`74`
`75`		`- if err := os.Mkdir(path, 0770); err != nil {`
	`75`	`+ if err := os.MkdirAll(path, 0770); err != nil {`
`76`	`76`	`return err`
`77`	`77`	`}`
`78`	`78`