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 | |
| parent | 7c440a1a2f5e555df2b2f367e3b6f6e46fe0f3f0 (diff) | |
Test that uuid -m works, falling back to plain uuid if not.
| -rw-r--r-- | Annex/UUID.hs | 7 | ||||
| -rw-r--r-- | Build/Configure.hs | 2 | ||||
| -rw-r--r-- | debian/changelog | 1 |
3 files changed, 3 insertions, 7 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 diff --git a/Build/Configure.hs b/Build/Configure.hs index 9468e1704..7fb195ad4 100644 --- a/Build/Configure.hs +++ b/Build/Configure.hs @@ -19,7 +19,7 @@ tests = , testCp "cp_a" "-a" , testCp "cp_p" "-p" , testCp "cp_reflink_auto" "--reflink=auto" - , TestCase "uuid generator" $ selectCmd "uuid" ["uuid", "uuidgen"] "" + , TestCase "uuid generator" $ selectCmd "uuid" ["uuid -m", "uuid", "uuidgen"] "" , TestCase "xargs -0" $ requireCmd "xargs_0" "xargs -0 </dev/null" , TestCase "rsync" $ requireCmd "rsync" "rsync --version >/dev/null" , TestCase "curl" $ testCmd "curl" "curl --version >/dev/null" diff --git a/debian/changelog b/debian/changelog index c102a3f7b..7bf05af0b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ git-annex (3.20120925) UNRELEASED; urgency=low * copy: Avoid updating the location log when no copy is performed. + * Test that uuid -m works, falling back to plain uuid if not. -- Joey Hess <joeyh@debian.org> Mon, 24 Sep 2012 19:58:07 -0400 |