Merge pull request #3636 from ipfs/fix/writeable-file-close

close file before removing it in check writeable
ipfs · Jan 27, 2017 · c99a82d · c99a82d
2 parents 65e0704 + 7fc9c30
commit c99a82d
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/test/sharness/t0020-init.sh b/test/sharness/t0020-init.sh
@@ -63,7 +63,8 @@ test_expect_success ".ipfs/ has been created" '
 	test -d ".ipfs" &&
 	test -f ".ipfs/config" &&
 	test -d ".ipfs/datastore" &&
-	test -d ".ipfs/blocks" ||
+	test -d ".ipfs/blocks" &&
+	test ! -f ._check_writeable ||
 	test_fsh ls -al .ipfs
 '
 

diff --git a/thirdparty/dir/dir.go b/thirdparty/dir/dir.go
@@ -16,6 +16,7 @@ func Writable(path string) error {
 	}
 	// Check the directory is writeable
 	if f, err := os.Create(filepath.Join(path, "._check_writeable")); err == nil {
+		f.Close()
 		os.Remove(f.Name())
 	} else {
 		return errors.New("'" + path + "' is not writeable")