summaryrefslogtreecommitdiff
path: root/Annex
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2012-07-18 15:30:26 -0400
committerGravatar Joey Hess <joey@kitenet.net>2012-07-18 18:00:24 -0400
commitd1da9cf221aeea5c7ac8a313a18b559791a04f12 (patch)
treefe8d7e42efb89441d14ab8d5d71bb8f0f007330b /Annex
parentfc5652c811a9a644bb8964b3b8c13df24f2ec7c7 (diff)
switch from System.Cmd.Utils to System.Process
Test suite now passes with -threaded! I traced back all the hangs with -threaded to System.Cmd.Utils. It seems it's just crappy/unsafe/outdated, and should not be used. System.Process seems to be the cool new thing, so converted all the code to use it instead. In the process, --debug stopped printing commands it runs. I may try to bring that back later. Note that even SafeSystem was switched to use System.Process. Since that was a modified version of code from System.Cmd.Utils, it needed to be converted too. I also got rid of nearly all calls to forkProcess, and all calls to executeFile, which I'm also doubtful about working well with -threaded.
Diffstat (limited to 'Annex')
-rw-r--r--Annex/Branch.hs4
-rw-r--r--Annex/UUID.hs6
2 files changed, 6 insertions, 4 deletions
diff --git a/Annex/Branch.hs b/Annex/Branch.hs
index e551bfcd0..8e7f45a4a 100644
--- a/Annex/Branch.hs
+++ b/Annex/Branch.hs
@@ -164,9 +164,7 @@ get' staleok file = fromcache =<< getCache file
fromjournal Nothing
| staleok = withIndex frombranch
| otherwise = withIndexUpdate $ frombranch >>= cache
- frombranch = do
- liftIO $ putStrLn $ "frombranch " ++ file
- L.unpack <$> catFile fullname file
+ frombranch = L.unpack <$> catFile fullname file
cache content = do
setCache file content
return content
diff --git a/Annex/UUID.hs b/Annex/UUID.hs
index 517840fba..1d2175bcb 100644
--- a/Annex/UUID.hs
+++ b/Annex/UUID.hs
@@ -20,6 +20,8 @@ module Annex.UUID (
removeRepoUUID,
) where
+import System.Process
+
import Common.Annex
import qualified Git
import qualified Git.Config
@@ -32,8 +34,10 @@ configkey = annexConfig "uuid"
{- Generates a UUID. There is a library for this, but it's not packaged,
- so use the command line tool. -}
genUUID :: IO UUID
-genUUID = pOpen ReadFromPipe command params $ liftM toUUID . hGetLine
+genUUID = gen . lines <$> readProcess command params []
where
+ gen [] = error $ "no output from " ++ command
+ gen (l:_) = toUUID l
command = SysConfig.uuid
params
-- request a random uuid be generated