diff options
| author |  Joey Hess <joey@kitenet.net> | 2011-11-09 18:33:15 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2011-11-09 18:33:15 -0400 |
| commit | d3e1a3619ff6939367f43cbd46131b7f60ef6bd0 (patch) | |
| tree | bc7e29364f11d3369730b0b61ad58e942b95d1cf /Remote/Rsync.hs | |
| parent | 2934a65ac5bbab5ac127c495c8c2492e729c2b67 (diff) | |
safer inannex checking
git-annex-shell inannex now returns always 0, 1, or 100 (the last when
it's unclear if content is currently in the index due to it currently being
moved or dropped).
(Actual locking code still not yet written.)
Diffstat (limited to 'Remote/Rsync.hs')
| -rw-r--r-- | Remote/Rsync.hs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Remote/Rsync.hs b/Remote/Rsync.hs index 0dfad7293..54834be13 100644 --- a/Remote/Rsync.hs +++ b/Remote/Rsync.hs @@ -128,7 +128,7 @@ remove o k = withRsyncScratchDir $ \tmp -> do , Param $ rsyncKeyDir o k ] -checkPresent :: Git.Repo -> RsyncOpts -> Key -> Annex (Either IOException Bool) +checkPresent :: Git.Repo -> RsyncOpts -> Key -> Annex (Either String Bool) checkPresent r o k = do showAction $ "checking " ++ Git.repoDescribe r -- note: Does not currently differnetiate between rsync failing |