Merge pull request #761 from diegs/chmod

diegs · web-flow · commit fef22c1a1c09 · 2017-11-01T19:04:11.000-07:00
checkpointer: chmod before close.
diff --git a/pkg/checkpoint/manifest.go b/pkg/checkpoint/manifest.go
@@ -90,10 +90,10 @@ func writeAndAtomicRename(path string, data []byte, perm os.FileMode) error {
 	if _, err := tmpfile.Write(data); err != nil {
 		return err
 	}
-	if err := tmpfile.Close(); err != nil {
+	if err := tmpfile.Chmod(perm); err != nil {
 		return err
 	}
-	if err := tmpfile.Chmod(perm); err != nil {
+	if err := tmpfile.Close(); err != nil {
 		return err
 	}
 	return os.Rename(tmpfile.Name(), path)

Original file line number	Diff line number	Diff line change
`@@ -90,10 +90,10 @@ func writeAndAtomicRename(path string, data []byte, perm os.FileMode) error {`
`90`	`90`	`if _, err := tmpfile.Write(data); err != nil {`
`91`	`91`	`return err`
`92`	`92`	`}`
`93`		`- if err := tmpfile.Close(); err != nil {`
	`93`	`+ if err := tmpfile.Chmod(perm); err != nil {`
`94`	`94`	`return err`
`95`	`95`	`}`
`96`		`- if err := tmpfile.Chmod(perm); err != nil {`
	`96`	`+ if err := tmpfile.Close(); err != nil {`
`97`	`97`	`return err`
`98`	`98`	`}`
`99`	`99`	`return os.Rename(tmpfile.Name(), path)`