mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

use R.readSymbolicLink

Browse source 
This will be faster once gitAnnexLink is converted to a RawFilePath.
This commit is contained in:
Joey Hess 2019-12-06 14:19:23 -04:00
parent 360942ba12
commit 0e9d699ef3
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
1 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Command/Fix.hs
View file

@ -17,6 +17,7 @@ import Annex.Content
import Annex.Perms import Annex.Perms
import qualified Annex.Queue import qualified Annex.Queue
import qualified Database.Keys import qualified Database.Keys
import qualified Utility.RawFilePath as R
#if ! defined(mingw32_HOST_OS) #if ! defined(mingw32_HOST_OS)
import Utility.Touch import Utility.Touch
@ -39,11 +40,11 @@ data FixWhat = FixSymlinks | FixAll
start :: FixWhat -> RawFilePath -> Key -> CommandStart start :: FixWhat -> RawFilePath -> Key -> CommandStart
start fixwhat file key = do start fixwhat file key = do
currlink <- liftIO $ catchMaybeIO $ readSymbolicLink $ fromRawFilePath file currlink <- liftIO $ catchMaybeIO $ R.readSymbolicLink file
wantlink <- calcRepo $ gitAnnexLink (fromRawFilePath file) key wantlink <- calcRepo $ gitAnnexLink (fromRawFilePath file) key
case currlink of case currlink of
Just l Just l
| l /= wantlink -> fixby $ | l /= toRawFilePath wantlink -> fixby $
fixSymlink (fromRawFilePath file) wantlink fixSymlink (fromRawFilePath file) wantlink
| otherwise -> stop | otherwise -> stop
Nothing -> case fixwhat of Nothing -> case fixwhat of