diff options
| author |  Joey Hess <joey@kitenet.net> | 2011-06-22 14:27:50 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2011-06-22 14:27:50 -0400 |
| commit | d3f0106f2ed15a4e4abbc09cc3e985a27dfee662 (patch) | |
| tree | 2d5867dd13895eabc4def6412d791f543f3e2710 /Upgrade | |
| parent | 78a325b09315efd593e6b729de18f15871a0d643 (diff) | |
move LocationLog into Annex monad from IO
It will need to run in Annex so it can use Branch
Diffstat (limited to 'Upgrade')
| -rw-r--r-- | Upgrade/V1.hs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Upgrade/V1.hs b/Upgrade/V1.hs index 1e634e00e..c09bd74c1 100644 --- a/Upgrade/V1.hs +++ b/Upgrade/V1.hs @@ -134,9 +134,9 @@ moveLocationLogs = do -- log files that are not checked into git, -- as well as merging with already upgraded -- logs that have been pulled from elsewhere - old <- liftIO $ readLog f - new <- liftIO $ readLog dest - liftIO $ writeLog dest (old++new) + old <- readLog f + new <- readLog dest + writeLog dest (old++new) AnnexQueue.add "add" [Param "--"] dest AnnexQueue.add "add" [Param "--"] f AnnexQueue.add "rm" [Param "--quiet", Param "-f", Param "--"] f |