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

fix build failure on i386-ancient

Browse source 
Standalone: tmp/git-annex.linux/usr/lib/i386-linux-gnu/i686: renameFile: inappropriate type (is a directory)
This commit is contained in:
Joey Hess 2020-08-10 16:49:09 -04:00
parent 4466c1001d
commit ae325018eb
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
Build/LinuxMkLibs.hs
View file

@ -74,11 +74,12 @@ consolidateUsrLib top libdirs = go [] libdirs
go c (x:rest) = case filter (\d -> ("/usr" ++ d) == x) libdirs of go c (x:rest) = case filter (\d -> ("/usr" ++ d) == x) libdirs of
(d:_) -> do (d:_) -> do
fs <- getDirectoryContents (inTop top x) fs <- getDirectoryContents (inTop top x)
forM_ fs $ \f -> forM_ fs $ \f -> do
let src = inTop top (x </> f)
let dst = inTop top (d </> f)
unless (dirCruft f) $ unless (dirCruft f) $
renameFile unlessM (doesDirectoryExist src) $
(inTop top (x </> f)) renameFile src dst
(inTop top (d </> f))
go c rest go c rest
_ -> go (x:c) rest _ -> go (x:c) rest