use types to enforce that removeAnnex can only be called inside lockContent
This fixed one bug where it needed to be and wasn't (in Assistant.Unused). And also found one place where lockContent was used unnecessarily (by drop --from remote). A few other places like uninit probably don't really need to lockContent, but it doesn't hurt to do call it anyway. This commit was sponsored by David Wagner.
This commit is contained in:
parent
9cb78e18ad
commit
aebcc395ff
9 changed files with 35 additions and 31 deletions
|
@ -339,8 +339,8 @@ dropKey r key
|
|||
commitOnCleanup r $ onLocal r $ do
|
||||
ensureInitialized
|
||||
whenM (Annex.Content.inAnnex key) $ do
|
||||
Annex.Content.lockContent key $
|
||||
Annex.Content.removeAnnex key
|
||||
Annex.Content.lockContent key
|
||||
Annex.Content.removeAnnex
|
||||
logStatus key InfoMissing
|
||||
Annex.Content.saveState True
|
||||
return True
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue