diff options
| author |  Joey Hess <joeyh@joeyh.name> | 2015-10-01 14:13:53 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2015-10-01 14:18:57 -0400 |
| commit | 55d635e356ecae2dd90d8cea355656faf3b24db1 (patch) | |
| tree | 803d323f14548495c90eb402e9542a84c595a5aa /Command | |
| parent | 79e163ec1182e4b247f3a9b86f9096a96cdd299a (diff) | |
rename function
Diffstat (limited to 'Command')
| -rw-r--r-- | Command/AddUrl.hs | 4 | ||||
| -rw-r--r-- | Command/ReKey.hs | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/Command/AddUrl.hs b/Command/AddUrl.hs index de3bff407..32e89d20f 100644 --- a/Command/AddUrl.hs +++ b/Command/AddUrl.hs @@ -247,7 +247,7 @@ addUrlFileQuvi relaxed quviurl videourl file = do - it later. -} urlinfo <- Url.withUrlOptions (Url.getUrlInfo videourl) let sizedkey = addSizeUrlKey urlinfo key - prepGetViaTmpChecked sizedkey Nothing $ do + checkDiskSpaceToGet sizedkey Nothing $ do tmp <- fromRepo $ gitAnnexTmpObjectLocation key showOutput ok <- Transfer.notifyTransfer Transfer.Download (Just file) $ @@ -305,7 +305,7 @@ downloadWeb url urlinfo file = do - stable. -} downloadWith :: (FilePath -> MeterUpdate -> Annex Bool) -> Key -> UUID -> URLString -> FilePath -> Annex (Maybe Key) downloadWith downloader dummykey u url file = - prepGetViaTmpChecked dummykey Nothing $ do + checkDiskSpaceToGet dummykey Nothing $ do tmp <- fromRepo $ gitAnnexTmpObjectLocation dummykey ifM (runtransfer tmp) ( do diff --git a/Command/ReKey.hs b/Command/ReKey.hs index 597be57a5..e38ce3c50 100644 --- a/Command/ReKey.hs +++ b/Command/ReKey.hs @@ -52,7 +52,7 @@ perform file oldkey newkey = do {- Make a hard link to the old key content (when supported), - to avoid wasting disk space. -} linkKey :: Key -> Key -> Annex Bool -linkKey oldkey newkey = getViaTmpUnchecked newkey $ \tmp -> do +linkKey oldkey newkey = getViaTmp' newkey $ \tmp -> do src <- calcRepo $ gitAnnexLocation oldkey liftIO $ ifM (doesFileExist tmp) ( return True |