This commit is contained in:
Joey Hess 2012-06-12 11:32:06 -04:00
parent 85f0992c03
commit 942d8f7298
14 changed files with 20 additions and 21 deletions

View file

@ -145,13 +145,13 @@ fixLink key file = do
-}
whenM (liftIO $ doesFileExist file) $
unlessM (inAnnex key) $ do
showNote $ "fixing content location"
showNote "fixing content location"
dir <- liftIO $ parentDir <$> absPath file
let content = absPathFrom dir have
liftIO $ allowWrite (parentDir content)
moveAnnex key content
showNote $ "fixing link"
showNote "fixing link"
liftIO $ createDirectoryIfMissing True (parentDir file)
liftIO $ removeFile file
liftIO $ createSymbolicLink want file
@ -220,7 +220,7 @@ checkKeySize' key file bad = case Types.Key.keySize key of
Nothing -> return True
Just size -> do
size' <- fromIntegral . fileSize
<$> (liftIO $ getFileStatus file)
<$> liftIO (getFileStatus file)
comparesizes size size'
where
comparesizes a b = do