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

bugfix

Browse source 
Fix symlink detection

Also, make idempotent; cp may fail if the destination file exists in
some cases.
This commit is contained in:
Joey Hess 2019-10-17 11:55:51 -04:00
parent 76bb9ca43a
commit d0d416b215
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
1 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Build/Standalone.hs
View file

@ -51,7 +51,7 @@ installGitLibs topdir = do
destf <- (gitcoredestdir </>) destf <- (gitcoredestdir </>)
<$> relPathDirToFile execpath f <$> relPathDirToFile execpath f
createDirectoryIfMissing True (takeDirectory destf) createDirectoryIfMissing True (takeDirectory destf)
issymlink <- isSymbolicLink <$> getFileStatus f issymlink <- isSymbolicLink <$> getSymbolicLinkStatus f
if issymlink if issymlink
then do then do
-- many git-core files may symlink to eg -- many git-core files may symlink to eg
@ -61,6 +61,7 @@ installGitLibs topdir = do
linktarget <- readSymbolicLink f linktarget <- readSymbolicLink f
let linktarget' = gitcoredestdir </> "bin" </> takeFileName linktarget let linktarget' = gitcoredestdir </> "bin" </> takeFileName linktarget
createDirectoryIfMissing True (takeDirectory linktarget') createDirectoryIfMissing True (takeDirectory linktarget')
nukeFile destf
createSymbolicLink linktarget' destf createSymbolicLink linktarget' destf
else cp f destf else cp f destf
@ -87,7 +88,8 @@ installGitLibs topdir = do
[] -> error $ "git " ++ opt ++ "did not output a location" [] -> error $ "git " ++ opt ++ "did not output a location"
(p:_) -> return p (p:_) -> return p
cp src dest = cp src dest = do
nukeFile dest
unlessM (boolSystem "cp" [Param "-a", File src, File dest]) $ unlessM (boolSystem "cp" [Param "-a", File src, File dest]) $
error "cp failed" error "cp failed"