diff options
| author |  Joey Hess <joeyh@joeyh.name> | 2015-01-21 13:37:09 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2015-01-21 13:37:09 -0400 |
| commit | b6b368ed036f2e34ee4b7d39e5b41b1ba2d0a76c (patch) | |
| tree | 9d84826cd348e10252daf1219cbb012c80e1bdf4 /Locations.hs | |
| parent | b9e4fb7989e1644001c67c7cccd18ba5927f39db (diff) | |
remove absNormPathUnix, using my absPathFrom replacement
Diffstat (limited to 'Locations.hs')
| -rw-r--r-- | Locations.hs | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/Locations.hs b/Locations.hs index 596bf4f85..82c324e2c 100644 --- a/Locations.hs +++ b/Locations.hs @@ -144,11 +144,9 @@ gitAnnexLocation' key r crippled gitAnnexLink :: FilePath -> Key -> Git.Repo -> IO FilePath gitAnnexLink file key r = do currdir <- getCurrentDirectory - let absfile = fromMaybe whoops $ absNormPathUnix currdir file + let absfile = absPathFrom currdir file loc <- gitAnnexLocation' key r False relPathDirToFile (parentDir absfile) loc - where - whoops = error $ "unable to normalize " ++ file {- File used to lock a key's content. -} gitAnnexContentLock :: Key -> Git.Repo -> GitConfig -> IO FilePath |