Merge pull request #1295 from ipfs/fix/lock-check

catch other error that means the file is locked

Merge pull request #1295 from ipfs/fix/lock-check
catch other error that means the file is locked
1dd76fd1 · Juan Batiz-Benet · ee10b410 · 270b4770 · 1dd76fd1
Commit 1dd76fd1 authored 9 years ago by Juan Batiz-Benet
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 0 deletions

repo/fsrepo/lock/lock.go repo/fsrepo/lock/lock.go +3 -0

No files found.
--- a/repo/fsrepo/lock/lock.go
+++ b/repo/fsrepo/lock/lock.go
@@ -34,6 +34,9 @@ func Locked(confdir string) (bool, error) {
 		if err == syscall.EAGAIN {
 			return true, nil
 		}
+		if strings.Contains(err.Error(), "can't Lock file") {
+			return true, nil
+		}

 		// lock fails on permissions error
 		if os.IsPermission(err) {