diff options
| author |  Joey Hess <joey@kitenet.net> | 2013-11-14 17:04:58 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2013-11-14 17:04:58 -0400 |
| commit | 521ef9dfebd6a9418a5dce7d1686dbf353ddd0a0 (patch) | |
| tree | afe6bb5d52e21a049f04020ae448afb81adc02a7 /Logs/UUID.hs | |
| parent | f4b4f327b69189d24663a7db6407c1f7a6e48fdd (diff) | |
| parent | 5c6f6e4d0abb9b4856908a500611044b3b7a48e6 (diff) | |
Merge branch 'master' into tasty-tests
Conflicts:
Test.hs
Diffstat (limited to 'Logs/UUID.hs')
| -rw-r--r-- | Logs/UUID.hs | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/Logs/UUID.hs b/Logs/UUID.hs index 2f24a388e..154f86d51 100644 --- a/Logs/UUID.hs +++ b/Logs/UUID.hs @@ -28,13 +28,10 @@ import Types.UUID import Common.Annex import qualified Annex import qualified Annex.Branch +import Logs import Logs.UUIDBased import qualified Annex.UUID -{- Filename of uuid.log. -} -uuidLog :: FilePath -uuidLog = "uuid.log" - {- Records a description for a uuid in the log. -} describeUUID :: UUID -> String -> Annex () describeUUID uuid desc = do @@ -59,7 +56,7 @@ fixBadUUID = M.fromList . map fixup . M.toList | otherwise = (k, v) where kuuid = fromUUID k - isbad = not (isuuid kuuid) && isuuid lastword + isbad = not (isuuid kuuid) && not (null ws) && isuuid lastword ws = words $ value v lastword = Prelude.last ws fixeduuid = toUUID lastword |