mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

add inAnnex check to local lockKey

Browse source
This commit is contained in:
Joey Hess 2015-10-09 18:00:37 -04:00
parent 181d4fd459
commit 2154b7a38f
Failed to extract signature
1 changed files with 6 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Remote/Git.hs
View file

@ -369,8 +369,12 @@ lockKey r key callback
-- Lock content from perspective of remote, -- Lock content from perspective of remote,
-- and then run the callback in the original -- and then run the callback in the original
-- annex monad, not the remote's. -- annex monad, not the remote's.
onLocal r $ Annex.Content.lockContentShared key $ onLocal r $
liftIO . inorigrepo . callback Annex.Content.lockContentShared key $ \vc ->
ifM (Annex.Content.inAnnex key)
( liftIO $ inorigrepo $ callback vc
, failedlock
)
| Git.repoIsSsh (repo r) = do | Git.repoIsSsh (repo r) = do
showLocking r showLocking r
Just (cmd, params) <- Ssh.git_annex_shell (repo r) "lockcontent" Just (cmd, params) <- Ssh.git_annex_shell (repo r) "lockcontent"