diff options
Diffstat (limited to 'Command/Add.hs')
| -rw-r--r-- | Command/Add.hs | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/Command/Add.hs b/Command/Add.hs index d83817d72..ea0f85033 100644 --- a/Command/Add.hs +++ b/Command/Add.hs @@ -94,8 +94,9 @@ undo file key e = do src <- inRepo $ gitAnnexLocation key liftIO $ moveFile src file -{- Creates the symlink to the annexed content. -} -link :: FilePath -> Key -> Bool -> Annex () +{- Creates the symlink to the annexed content, and also returns the link's + - text. -} +link :: FilePath -> Key -> Bool -> Annex FilePath link file key hascontent = handle (undo file key) $ do l <- calcGitLink file key liftIO $ createSymbolicLink l file @@ -109,11 +110,13 @@ link file key hascontent = handle (undo file key) $ do mtime <- modificationTime <$> getFileStatus file touch file (TimeSpec mtime) False + return l + {- Note: Several other commands call this, and expect it to - create the symlink and add it. -} cleanup :: FilePath -> Key -> Bool -> CommandCleanup cleanup file key hascontent = do - link file key hascontent + _ <- link file key hascontent params <- ifM (Annex.getState Annex.force) ( return [Param "-f"] , return [] |