diff options
| author |  Joey Hess <joey@kitenet.net> | 2012-06-07 15:19:44 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2012-06-07 15:19:44 -0400 |
| commit | 0a11b35d89104fa0b9653f15963d273a0d3585c3 (patch) | |
| tree | f09621e0443bb526975543299adf1aefb64b47ef /Upgrade | |
| parent | 727158ff5546233e6f6b8bd8543c9514e3bd7af6 (diff) | |
extend Git.Queue to be able to queue more than simple git commands
While I was in there, I noticed and fixed a bug in the queue size
calculations. It was never encountered only because Queue.add was
only ever run with 1 file in the list.
Diffstat (limited to 'Upgrade')
| -rw-r--r-- | Upgrade/V1.hs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Upgrade/V1.hs b/Upgrade/V1.hs index 280742f06..31c0210c0 100644 --- a/Upgrade/V1.hs +++ b/Upgrade/V1.hs @@ -94,7 +94,7 @@ updateSymlinks = do link <- calcGitLink f k liftIO $ removeFile f liftIO $ createSymbolicLink link f - Annex.Queue.add "add" [Param "--"] [f] + Annex.Queue.addCommand "add" [Param "--"] [f] moveLocationLogs :: Annex () moveLocationLogs = do @@ -121,9 +121,9 @@ moveLocationLogs = do old <- liftIO $ readLog1 f new <- liftIO $ readLog1 dest liftIO $ writeLog1 dest (old++new) - Annex.Queue.add "add" [Param "--"] [dest] - Annex.Queue.add "add" [Param "--"] [f] - Annex.Queue.add "rm" [Param "--quiet", Param "-f", Param "--"] [f] + Annex.Queue.addCommand "add" [Param "--"] [dest] + Annex.Queue.addCommand "add" [Param "--"] [f] + Annex.Queue.addCommand "rm" [Param "--quiet", Param "-f", Param "--"] [f] oldlog2key :: FilePath -> Maybe (FilePath, Key) oldlog2key l |