diff options
author | Joey Hess <joey@kitenet.net> | 2012-09-25 10:48:20 -0400 |
---|---|---|
committer | Joey Hess <joey@kitenet.net> | 2012-09-25 10:48:20 -0400 |
commit | f414371dce04e80054456ecae8bea57782c957cf (patch) | |
tree | fcb0f53257ff9aaacfc2e8d4770dfda590cdc308 /Annex | |
parent | 7c440a1a2f5e555df2b2f367e3b6f6e46fe0f3f0 (diff) |
Test that uuid -m works, falling back to plain uuid if not.
Diffstat (limited to 'Annex')
-rw-r--r-- | Annex/UUID.hs | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/Annex/UUID.hs b/Annex/UUID.hs index 09862f9fc..df77ac248 100644 --- a/Annex/UUID.hs +++ b/Annex/UUID.hs @@ -36,12 +36,7 @@ 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 - | command == "uuid" = ["-m"] - -- uuidgen generates random uuid by default - | otherwise = [] + (command:params) = words SysConfig.uuid {- Get current repository's UUID. -} getUUID :: Annex UUID |