diff options
| author |  Joey Hess <joeyh@joeyh.name> | 2016-02-16 14:43:43 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2016-02-16 14:43:43 -0400 |
| commit | c11633a52dbdcc187f5afcef50776fa41c7327ce (patch) | |
| tree | 1de24f154cb953f9ce78c68315bc046d48f838c7 /Command/AddUrl.hs | |
| parent | 3776dee0a33fe3fe0cd1aceb14b5c2d0511d6c05 (diff) | |
annex.addunlocked
* add, addurl, import, importfeed: When in a v6 repository on a crippled
filesystem, add files unlocked.
* annex.addunlocked: New configuration setting, makes files always be
added unlocked. (v6 only)
Diffstat (limited to 'Command/AddUrl.hs')
| -rw-r--r-- | Command/AddUrl.hs | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/Command/AddUrl.hs b/Command/AddUrl.hs index 333ca494d..0370a2fc9 100644 --- a/Command/AddUrl.hs +++ b/Command/AddUrl.hs @@ -12,7 +12,6 @@ import Network.URI import Command import Backend import qualified Annex -import qualified Annex.Queue import qualified Annex.Url as Url import qualified Backend.URL import qualified Remote @@ -24,8 +23,6 @@ import Annex.UUID import Logs.Web import Types.KeySource import Types.UrlContents -import Config -import Annex.Content.Direct import Annex.FileMatcher import Logs.Location import Utility.Metered @@ -363,13 +360,7 @@ cleanup u url file key mtmp = case mtmp of when (isJust mtmp) $ logStatus key InfoPresent setUrlPresent u key url - addLink file key Nothing - whenM isDirect $ do - void $ addAssociatedFile key file - {- For moveAnnex to work in direct mode, the symlink - - must already exist, so flush the queue. -} - Annex.Queue.flush - maybe noop (moveAnnex key) mtmp + addAnnexedFile file key mtmp nodownload :: URLString -> Url.UrlInfo -> FilePath -> Annex (Maybe Key) nodownload url urlinfo file |