diff options
author | Joey Hess <joey@kitenet.net> | 2011-01-27 17:00:32 -0400 |
---|---|---|
committer | Joey Hess <joey@kitenet.net> | 2011-01-27 17:00:32 -0400 |
commit | 167523f09d48777f3a5931fdcbc21b9d363e0e6c (patch) | |
tree | 698c1c601b39b617ccc02259053c3c39372ed5db /CmdLine.hs | |
parent | 6be516ae3bddb8f05ea62661019836e03be12a2c (diff) |
better directory handling
Rename Locations functions for better consitency, and make their values
more consistent too.
Used </> rather than manually building paths. There are still more places
that manually do so, but are tricky, due to the behavior of </> when
the second FilePath is absolute. So I only changed places where
it obviously was relative.
Diffstat (limited to 'CmdLine.hs')
-rw-r--r-- | CmdLine.hs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/CmdLine.hs b/CmdLine.hs index 76402a821..68d1e0dd3 100644 --- a/CmdLine.hs +++ b/CmdLine.hs @@ -111,7 +111,7 @@ shutdown errnum = do -- are left behind to allow resuming on re-run. when (errnum == 0) $ do g <- Annex.gitRepo - let tmp = annexTmpLocation g + let tmp = gitAnnexTmpDir g exists <- liftIO $ doesDirectoryExist tmp when exists $ liftIO $ removeDirectoryRecursive tmp liftIO $ createDirectoryIfMissing True tmp |